Merge branch 'master' into fix-glob-virtual-file

Author: josh

test/fixtures/alternate_config_project/config/environments/production.rb

@@ -11,7 +11,11 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
 
   # Compress JavaScripts and CSS
   config.assets.css_compressor = :yui

test/fixtures/alternate_config_project/config/environments/test.rb

@@ -8,7 +8,11 @@
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = true
+  else
+    config.serve_static_assets = true
+  end
   config.static_cache_control = "public, max-age=3600"
 
   config.eager_load = false

test/fixtures/engine_project/test/dummy/config/environments/production.rb

@@ -20,7 +20,11 @@
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor  = :uglifier

test/fixtures/engine_project/test/dummy/config/environments/test.rb

@@ -13,7 +13,11 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets = true
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = true
+  else
+    config.serve_static_assets = true
+  end
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

test/fixtures/sass_project/config/environments/production.rb

@@ -12,7 +12,11 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
 
   # Specify the default JavaScript compressor
   config.assets.js_compressor  = :uglifier

test/fixtures/sass_project/config/environments/test.rb

@@ -11,7 +11,11 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = true
+  else
+    config.serve_static_assets = true
+  end
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

test/fixtures/scss_project/config/environments/production.rb

@@ -11,7 +11,11 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
 
   # Specify the default JavaScript compressor
   config.assets.js_compressor  = :uglifier

test/fixtures/scss_project/config/environments/test.rb

@@ -10,7 +10,11 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = true
+  else
+    config.serve_static_assets = true
+  end
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

test/gemfiles/Gemfile-rails-4-2

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: "../.."
 
-gem "rails", "4.2.0.rc1"
+gem "rails", "~> 4.2.0"