Merge branch 'master' into psgi
authorFlorian Ragwitz <rafl@debian.org>
Fri, 3 Dec 2010 12:20:35 +0000 (12:20 +0000)
committerFlorian Ragwitz <rafl@debian.org>
Fri, 3 Dec 2010 12:20:35 +0000 (12:20 +0000)
commit9c74923de2304b8c8f0a7a2faa0854ad9b4d3a92
treebfe09abf6d9a07160c0408e807a9c22cf148dd2b
parentfb34eb9c063c53abd061d260a30f0ca7c57a0833
Merge branch 'master' into psgi

master: (44 commits)
Fixed chained action order resolution to pass t/aggregate/live__component_controller_action_chained2.t and without break any other test.
Clarify end action after forward / detach
Fix passing file GLOBs to $c->res->body
Clarify docs
Added a --title parameter to fastcgi script, sets process title for FCGI::ProcManager
update MooseX module version due to deprecated warning
typo in docs fixed
Version 5.80029
Patch from the mailing list to clarify view warning
Avoid issues when just using CMOP::Class
Need to use _add_meta_method from new Moose onwards to avoid warnings
Actually bump versions, ACTUAL 5.80028, sorry
Version 5.80028
Bug fix for ctx_request, via matso++
Don't rely on qw() providing PAREN tokens
We use Class::MOP in Catalyst::Utils, so load it
Version 5.80027
Fix bug in the tests
Version 5.80026
Add doc patch for go and captures.
...

Conflicts:
lib/Catalyst/Engine/FastCGI.pm
lib/Catalyst/Script/FastCGI.pm
lib/Catalyst/ScriptRole.pm
lib/Catalyst/Test.pm
t/aggregate/live_component_controller_action_streaming.t
36 files changed:
Changes
Makefile.PL
lib/Catalyst.pm
lib/Catalyst/DispatchType/Chained.pm
lib/Catalyst/Exception/Interface.pm
lib/Catalyst/Runtime.pm
lib/Catalyst/Script/CGI.pm
lib/Catalyst/Script/FastCGI.pm
lib/Catalyst/Script/Server.pm
lib/Catalyst/ScriptRole.pm
lib/Catalyst/Test.pm
lib/Catalyst/Utils.pm
t/aggregate/live__component_controller_action_chained2.t [new file with mode: 0644]
t/aggregate/live_component_controller_action_streaming.t
t/aggregate/live_engine_response_headers.t
t/aggregate/live_view_warnings.t [new file with mode: 0644]
t/aggregate/unit_core_script_fastcgi.t
t/aggregate/unit_core_script_help.t
t/aggregate/unit_core_script_test.t
t/aggregate/unit_core_setup.t
t/aggregate/unit_core_setup_stats.t
t/author/podcoverage.t
t/lib/ChainedActionsApp.pm [new file with mode: 0644]
t/lib/ChainedActionsApp/Controller/Root.pm [new file with mode: 0644]
t/lib/TestApp/Controller/Action/Streaming.pm
t/lib/TestApp/Controller/Anon.pm
t/lib/TestApp/Controller/Root.pm
t/lib/TestAppShowInternalActions.pm [new file with mode: 0644]
t/lib/TestAppShowInternalActions/Controller/Root.pm [new file with mode: 0644]
t/lib/TestAppViewWarnings.pm [new file with mode: 0644]
t/lib/TestAppViewWarnings/Controller/Root.pm [new file with mode: 0644]
t/live_catalyst_test.t
t/live_show_internal_actions_warnings.t [new file with mode: 0644]
t/optional_http-server-restart.t
t/optional_threads.t
t/unit_core_methodattributes_method_metaclass_on_subclasses.t