diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-03-03 13:20:44 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-03-03 13:20:44 -0700 |
| commit | 9ee6f3cc8ef1cd50648ec2882803943d3bd1f24a (patch) | |
| tree | 6060894be73e4d699528cc4b8acd8ef4b06e2c1e /railties/lib/rails/application | |
| parent | 86cf7a2d166430fac1611aa7593b52b46eeb9f70 (diff) | |
| download | rails-9ee6f3cc8ef1cd50648ec2882803943d3bd1f24a.tar.gz rails-9ee6f3cc8ef1cd50648ec2882803943d3bd1f24a.tar.bz2 rails-9ee6f3cc8ef1cd50648ec2882803943d3bd1f24a.zip | |
Bring config.allow_concurrency back
Since the Rack::Lock still exists in development,
let's provide a way to disable it explicitly.
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 8abd2dc572..31fc80e544 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -5,7 +5,7 @@ require 'rails/engine/configuration' module Rails class Application class Configuration < ::Rails::Engine::Configuration - attr_accessor :asset_host, :assets, :autoflush_log, + attr_accessor :allow_concurrency, :asset_host, :assets, :autoflush_log, :cache_classes, :cache_store, :consider_all_requests_local, :console, :eager_load, :exceptions_app, :file_watcher, :filter_parameters, :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags, @@ -20,6 +20,7 @@ module Rails def initialize(*) super self.encoding = "utf-8" + @allow_concurrency = nil @consider_all_requests_local = false @filter_parameters = [] @filter_redirect = [] |