diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
| commit | d3042ef80c4406c90ff1e120059a99784d8ae79f (patch) | |
| tree | a779b4fced3fd546d7c7c855fee41f3d996afba0 /actionpack/lib/action_controller/dispatch/middlewares.rb | |
| parent | d522b7ccf61a71b4c66ddf39368513d1fd9cd577 (diff) | |
| parent | eb201e64c0b68aee6d0715d44cf48178204c4133 (diff) | |
| download | rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.gz rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.bz2 rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/dispatch/middlewares.rb')
| -rw-r--r-- | actionpack/lib/action_controller/dispatch/middlewares.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/dispatch/middlewares.rb b/actionpack/lib/action_controller/dispatch/middlewares.rb index b5adbae746..31a7b00d28 100644 --- a/actionpack/lib/action_controller/dispatch/middlewares.rb +++ b/actionpack/lib/action_controller/dispatch/middlewares.rb @@ -3,6 +3,11 @@ use "Rack::Lock", :if => lambda { } use "ActionDispatch::Failsafe" +use "ActionDispatch::ShowExceptions", lambda { ActionController::Base.consider_all_requests_local } +use "ActionDispatch::Rescue", lambda { + controller = (::ApplicationController rescue ActionController::Base) + controller.method(:rescue_action) +} use lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options } |