diff options
| author | Ahmed El-Daly <aeldaly@developergurus.com> | 2009-01-21 22:18:10 -0500 |
|---|---|---|
| committer | Ahmed El-Daly <aeldaly@developergurus.com> | 2009-01-21 22:18:10 -0500 |
| commit | f08a78a057782577d5efbc82662d7898e26dcb8c (patch) | |
| tree | d0638cf1d180ed3713ecafcf36ea1df9bc5eeb7a /actionpack/lib/action_controller/middlewares.rb | |
| parent | c5069bd4951419ea02aea35ac5c121bc0c311940 (diff) | |
| parent | e8f7da6118936af2d145b3c025db4b4dcd0b3308 (diff) | |
| download | rails-f08a78a057782577d5efbc82662d7898e26dcb8c.tar.gz rails-f08a78a057782577d5efbc82662d7898e26dcb8c.tar.bz2 rails-f08a78a057782577d5efbc82662d7898e26dcb8c.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/middlewares.rb')
| -rw-r--r-- | actionpack/lib/action_controller/middlewares.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/middlewares.rb b/actionpack/lib/action_controller/middlewares.rb index 0f038b8856..30dbc26f11 100644 --- a/actionpack/lib/action_controller/middlewares.rb +++ b/actionpack/lib/action_controller/middlewares.rb @@ -1,4 +1,4 @@ -use "ActionController::Lock", :if => lambda { +use "Rack::Lock", :if => lambda { !ActionController::Base.allow_concurrency } @@ -19,4 +19,5 @@ use "ActiveRecord::QueryCache", :if => lambda { defined?(ActiveRecord) } end use ActionController::RewindableInput +use ActionController::ParamsParser use Rack::MethodOverride |