diff options
author | José Valim <jose.valim@gmail.com> | 2010-02-01 11:40:27 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-02-01 11:40:27 +0100 |
commit | 0dece7929cf5b04f008640936fb3ece24ce80daa (patch) | |
tree | 4e21b6c9c1e89a80a0f91e3ef27334755a6d26e7 /railties/lib/rails/application/configuration.rb | |
parent | a8c5d22c230ae46f410eed68c9b63ed31379ebbf (diff) | |
download | rails-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/application/configuration.rb')
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 31787b5cc9..d6ad045294 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -5,7 +5,7 @@ module Rails class Configuration < ::Rails::Engine::Configuration include ::Rails::Configuration::Deprecated - attr_accessor :cache_classes, :cache_store, :colorize_logging, + attr_accessor :allow_concurrency, :cache_classes, :cache_store, :colorize_logging, :consider_all_requests_local, :dependency_loading, :filter_parameters, :log_level, :logger, :metals, :plugins, :preload_frameworks, :reload_engines, :reload_plugins, @@ -13,11 +13,13 @@ module Rails def initialize(*) super + @allow_concurrency = false @colorize_logging = true @filter_parameters = [] @dependency_loading = true @serve_static_assets = true @time_zone = "UTC" + @consider_all_requests_local = true end def paths @@ -50,7 +52,7 @@ module Rails self.preload_frameworks = true self.cache_classes = true self.dependency_loading = false - self.action_controller.allow_concurrency = true if respond_to?(:action_controller) + self.allow_concurrency = true self end |