diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-22 12:00:13 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-22 12:00:13 +0200 |
| commit | 4163ccec2343ee66e2488f067eab2a15260e1219 (patch) | |
| tree | 70213bd4d187c88b2fd0bbf05a54eed7ec3a49f7 /railties/lib/rails/application | |
| parent | a8330c2006e90a6da8f621fdaf1156fa63b4049a (diff) | |
| download | rails-4163ccec2343ee66e2488f067eab2a15260e1219.tar.gz rails-4163ccec2343ee66e2488f067eab2a15260e1219.tar.bz2 rails-4163ccec2343ee66e2488f067eab2a15260e1219.zip | |
Clean up the config object in ActionPack. Create config_accessor which just delegates to the config object, reducing the number of deprecations and add specific tests.
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 11bf6a6e72..874b3a78b6 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -128,13 +128,13 @@ module Rails end end - protected - def session_options return @session_options unless @session_store == :cookie_store @session_options.merge(:secret => @secret_token) end + protected + def default_middleware_stack ActionDispatch::MiddlewareStack.new.tap do |middleware| middleware.use('::ActionDispatch::Static', lambda { paths.public.to_a.first }, :if => lambda { serve_static_assets }) |