aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-17 12:24:42 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-17 12:24:59 -0500
commit8118fca9beec675fba19395e7d1027eaa4b5703a (patch)
treeba49bc63cb8bd1e2dbb222f59bfb023880ecf553 /actionpack/lib/action_controller
parentc3319504f066c9362b4b30e1e15bbd1cadde8e25 (diff)
downloadrails-8118fca9beec675fba19395e7d1027eaa4b5703a.tar.gz
rails-8118fca9beec675fba19395e7d1027eaa4b5703a.tar.bz2
rails-8118fca9beec675fba19395e7d1027eaa4b5703a.zip
Merge Failsafe middleware into ShowExceptions
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/dispatch/middlewares.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatch/middlewares.rb b/actionpack/lib/action_controller/dispatch/middlewares.rb
index 0e4ab6fa39..e4e3a704c0 100644
--- a/actionpack/lib/action_controller/dispatch/middlewares.rb
+++ b/actionpack/lib/action_controller/dispatch/middlewares.rb
@@ -2,7 +2,6 @@ use "Rack::Lock", :if => lambda {
!ActionController::Base.allow_concurrency
}
-use "ActionDispatch::Failsafe"
use "ActionDispatch::ShowExceptions", lambda { ActionController::Base.consider_all_requests_local }
use "ActionDispatch::Rescue", lambda {
controller = (::ApplicationController rescue ActionController::Base)