diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-15 14:44:27 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-15 14:55:13 -0600 |
| commit | ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb (patch) | |
| tree | a6213e17ef6d01215b606b5fd11dcd05ca0dafda /railties | |
| parent | 3da29f647bad5e79c90721ac23658940abddd27c (diff) | |
| download | rails-ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb.tar.gz rails-ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb.tar.bz2 rails-ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb.zip | |
Move Flash into middleware
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/middleware_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index cf452ac611..a2fab120cf 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -16,6 +16,7 @@ module Rails middleware.use('ActionDispatch::ShowExceptions', lambda { ActionController::Base.consider_all_requests_local }) middleware.use('ActionDispatch::Callbacks', lambda { ActionController::Dispatcher.prepare_each_request }) middleware.use(lambda { ActionController::Base.session_store }, lambda { ActionController::Base.session_options }) + middleware.use('ActionDispatch::Flash', :if => lambda { ActionController::Base.session_store }) middleware.use('ActionDispatch::ParamsParser') middleware.use('::Rack::MethodOverride') middleware.use('::ActionDispatch::Head') diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index c2b8db495f..7b3077bb6e 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -20,6 +20,7 @@ module ApplicationTests "ActionDispatch::ShowExceptions", "ActionDispatch::Callbacks", "ActionDispatch::Session::CookieStore", + "ActionDispatch::Flash", "ActionDispatch::Cascade", "ActionDispatch::ParamsParser", "Rack::MethodOverride", |