diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-01-17 10:16:31 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-01-17 10:16:31 -0600 |
| commit | 515a1a332808eb7c2f9c006fc1903e1e8555b7fa (patch) | |
| tree | 265b1e7477275c2a7958c65162e776054e806c84 /actionpack/lib/action_controller/middlewares.rb | |
| parent | 3ee4e009185173aab78f6503ee45e3ef4482874e (diff) | |
| download | rails-515a1a332808eb7c2f9c006fc1903e1e8555b7fa.tar.gz rails-515a1a332808eb7c2f9c006fc1903e1e8555b7fa.tar.bz2 rails-515a1a332808eb7c2f9c006fc1903e1e8555b7fa.zip | |
Lock middleware has been committed upstream
Diffstat (limited to 'actionpack/lib/action_controller/middlewares.rb')
| -rw-r--r-- | actionpack/lib/action_controller/middlewares.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/middlewares.rb b/actionpack/lib/action_controller/middlewares.rb index 0f038b8856..cbcb5cb3e4 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 } |