aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-03 13:07:39 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-03 13:07:39 +0200
commit1ca81238b5abcbdad667d45a588fdb1f68a0516e (patch)
treeb775f19eeeff93a3efb805eb8f2082116b9cef63 /railties/lib/rails/application.rb
parent06ddda0a5f659cab8c2c76cfcb3b27ac5bb47ea6 (diff)
downloadrails-1ca81238b5abcbdad667d45a588fdb1f68a0516e.tar.gz
rails-1ca81238b5abcbdad667d45a588fdb1f68a0516e.tar.bz2
rails-1ca81238b5abcbdad667d45a588fdb1f68a0516e.zip
Add static_cache_control as configuration option and set a default for test. Should improve performance in acceptance tests.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 0c3c7737ea..4e82761e5d 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -152,7 +152,7 @@ module Rails
end
if config.serve_static_assets
- middleware.use ::ActionDispatch::Static, paths["public"].first
+ middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control
end
middleware.use ::Rack::Lock unless config.allow_concurrency