aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-22 17:31:29 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-22 17:31:29 -0800
commite7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9 (patch)
treedfc9e049c937a56c2fc1e80ae8e8b71880d1615d /railties
parentec095456d859da4a09c7401585c211dc0f01fccd (diff)
parentf737c2d69bb3659a553c7c0e21e316b1a4a1b98a (diff)
downloadrails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.tar.gz
rails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.tar.bz2
rails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.zip
Merge
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index e6f2d30429..d7a89ba2be 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -208,6 +208,7 @@ module Rails
initializer :initialize_middleware_stack do
if config.frameworks.include?(:action_controller)
config.middleware.use(::Rack::Lock, :if => lambda { ActionController::Base.allow_concurrency })
+ config.middleware.use(::Rack::Runtime)
config.middleware.use(ActionDispatch::ShowExceptions, lambda { ActionController::Base.consider_all_requests_local })
config.middleware.use(ActionDispatch::Callbacks, lambda { ActionController::Dispatcher.prepare_each_request })
config.middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options })