Add static_cache_control as configuration option and set a default for test. Should improve performance in acceptance tests.

1 files changed, 2 insertions, 1 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index f818313955..29b9c27a13 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -9,7 +9,7 @@ module Rails
                     :dependency_loading, :encoding, :filter_parameters,
                     :force_ssl, :helpers_paths, :logger, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
-                    :session_options, :time_zone, :whiny_nils
+                    :static_cache_control, :session_options, :time_zone, :whiny_nils
 
       attr_writer :log_level
 
@@ -22,6 +22,7 @@ module Rails
         @helpers_paths               = []
         @dependency_loading          = true
         @serve_static_assets         = true
+        @static_cache_control        = nil
         @force_ssl                   = false
         @session_store               = :cookie_store
         @session_options             = {}