diff options
author | Joshua Peek <josh@joshpeek.com> | 2008-06-08 22:11:08 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-06-08 22:11:50 -0500 |
commit | 0c9281e82140f3a69e4473b3bcefd5ccebd79e2d (patch) | |
tree | 48fa0799cb0d7e288de80c410b23c6b4267ac09e /actionpack | |
parent | ff5f155f8dc1d2ba363718c3e17f99719399eab5 (diff) | |
download | rails-0c9281e82140f3a69e4473b3bcefd5ccebd79e2d.tar.gz rails-0c9281e82140f3a69e4473b3bcefd5ccebd79e2d.tar.bz2 rails-0c9281e82140f3a69e4473b3bcefd5ccebd79e2d.zip |
Drop ActionController::Base.allow_concurrency flag
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 8265b5b04f..3096716dba 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Drop ActionController::Base.allow_concurrency flag [Josh Peek] + * More efficient concat and capture helpers. Remove ActionView::Base.erb_variable. [Jeremy Kemper] * Added page.reload functionality. Resolves #277. [Sean Huber] diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index a036600c2b..44269fc735 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -283,13 +283,6 @@ module ActionController #:nodoc: @@debug_routes = true cattr_accessor :debug_routes - # Indicates to Mongrel or Webrick whether to allow concurrent action - # processing. Your controller actions and any other code they call must - # also behave well when called from concurrent threads. Turned off by - # default. - @@allow_concurrency = false - cattr_accessor :allow_concurrency - # Modern REST web services often need to submit complex data to the web application. # The <tt>@@param_parsers</tt> hash lets you register handlers which will process the HTTP body and add parameters to the # <tt>params</tt> hash. These handlers are invoked for POST and PUT requests. |