Merge branch 'master' of https://github.com/rails/rails into performance_test

Conflicts:
	activesupport/lib/active_support/testing/performance.rb

1 files changed, 6 insertions, 2 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index e5476fbe7a..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             = {}
@@ -33,8 +34,11 @@ module Rails
         @assets = ActiveSupport::OrderedOptions.new
         @assets.enabled    = false
         @assets.paths      = []
-        @assets.precompile = []
+        @assets.precompile = [ /\w+\.(?!js|css)$/, "application.js", "application.css" ]
         @assets.prefix     = "/assets"
+
+        @assets.js_compressor  = nil
+        @assets.css_compressor = nil
       end
 
       def compiled_asset_path