aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/configuration.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-02-01 11:40:27 +0100
committerJosé Valim <jose.valim@gmail.com>2010-02-01 11:40:27 +0100
commit0dece7929cf5b04f008640936fb3ece24ce80daa (patch)
tree4e21b6c9c1e89a80a0f91e3ef27334755a6d26e7 /railties/lib/rails/configuration.rb
parenta8c5d22c230ae46f410eed68c9b63ed31379ebbf (diff)
downloadrails-0dece7929cf5b04f008640936fb3ece24ce80daa.tar.gz
rails-0dece7929cf5b04f008640936fb3ece24ce80daa.tar.bz2
rails-0dece7929cf5b04f008640936fb3ece24ce80daa.zip
Deprecate AC configuration values which were moved to Rack.
Diffstat (limited to 'railties/lib/rails/configuration.rb')
-rw-r--r--railties/lib/rails/configuration.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index a7519397a6..7887a5d25f 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -8,10 +8,10 @@ module Rails
def middleware
@@default_middleware_stack ||= ActionDispatch::MiddlewareStack.new.tap do |middleware|
middleware.use('::ActionDispatch::Static', lambda { Rails.public_path }, :if => lambda { Rails.application.config.serve_static_assets })
- middleware.use('::Rack::Lock', :if => lambda { !ActionController::Base.allow_concurrency })
+ middleware.use('::Rack::Lock', :if => lambda { !Rails.application.config.allow_concurrency })
middleware.use('::Rack::Runtime')
middleware.use('::Rails::Rack::Logger')
- middleware.use('::ActionDispatch::ShowExceptions', lambda { ActionController::Base.consider_all_requests_local })
+ middleware.use('::ActionDispatch::ShowExceptions', lambda { Rails.application.config.consider_all_requests_local })
middleware.use('::ActionDispatch::Callbacks', lambda { !Rails.application.config.cache_classes })
middleware.use('::ActionDispatch::Cookies')
middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options })