diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-16 17:13:58 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-16 17:13:58 +0200 |
| commit | 6be72a1e6287c5c098dd518ddc0467e473164869 (patch) | |
| tree | 89e7f6bf9ff6b7cf1ed5f2424991dc472e6a2c24 /actionpack/lib/action_controller/dispatch | |
| parent | c8fb22bc2933beb5c6cc4113380c8faf77d87ffe (diff) | |
| parent | a6d8ca0f0e65ce509793713cb1efe4ab721b9eb4 (diff) | |
| download | rails-6be72a1e6287c5c098dd518ddc0467e473164869.tar.gz rails-6be72a1e6287c5c098dd518ddc0467e473164869.tar.bz2 rails-6be72a1e6287c5c098dd518ddc0467e473164869.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/dispatch')
| -rw-r--r-- | actionpack/lib/action_controller/dispatch/middlewares.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/dispatch/middlewares.rb b/actionpack/lib/action_controller/dispatch/middlewares.rb index f99637b109..0e4ab6fa39 100644 --- a/actionpack/lib/action_controller/dispatch/middlewares.rb +++ b/actionpack/lib/action_controller/dispatch/middlewares.rb @@ -6,6 +6,7 @@ use "ActionDispatch::Failsafe" use "ActionDispatch::ShowExceptions", lambda { ActionController::Base.consider_all_requests_local } use "ActionDispatch::Rescue", lambda { controller = (::ApplicationController rescue ActionController::Base) + # TODO: Replace with controller.action(:_rescue_action) controller.method(:rescue_action) } |