diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:16:35 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:24:27 -0800 |
| commit | 15b3b74624eb4c5ae383956950cab12ca9899131 (patch) | |
| tree | 7a8c5cf8044d79a7656abff25c080e06e7423d4c /railties/lib | |
| parent | 1f0f05b10c924d2f0d0ff4c74cbd979e77deea1d (diff) | |
| download | rails-15b3b74624eb4c5ae383956950cab12ca9899131.tar.gz rails-15b3b74624eb4c5ae383956950cab12ca9899131.tar.bz2 rails-15b3b74624eb4c5ae383956950cab12ca9899131.zip | |
Fix all the broken tests due to the AC configuration refactor
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index a26978ef92..a78e115fe1 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -88,7 +88,7 @@ module Rails middleware.use('::Rack::Sendfile', lambda { action_dispatch.x_sendfile_header }) middleware.use('::ActionDispatch::Callbacks', lambda { !cache_classes }) middleware.use('::ActionDispatch::Cookies') - middleware.use(lambda { action_controller.session_store }, lambda { action_controller.session_options }) + middleware.use(lambda { ActionController::SessionManagement.session_store_for(action_controller.session_store) }, lambda { action_controller.session }) middleware.use('::ActionDispatch::Flash', :if => lambda { action_controller.session_store }) middleware.use(lambda { metal_loader.build_middleware(metals) }, :if => lambda { metal_loader.metals.any? }) middleware.use('ActionDispatch::ParamsParser') |