From 0604fa3c4efaca21807d6190edd3f69c55766188 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 19 Aug 2015 12:16:41 -0400 Subject: [PATCH] Fixed config.serve_static_assets DEPRECATION WARNING --- Gemfile | 2 +- Gemfile.lock | 69 ++++++++++++++++--------------- config/environments/production.rb | 2 +- config/environments/test.rb | 2 +- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index effa434..dbe01fe 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' #don't upgrade -gem 'rails', '4.2.2' +gem 'rails', '4.2.3' ruby '2.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 6c604d7..1485ea3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,36 +1,36 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.2) - actionpack (= 4.2.2) - actionview (= 4.2.2) - activejob (= 4.2.2) + actionmailer (4.2.3) + actionpack (= 4.2.3) + actionview (= 4.2.3) + activejob (= 4.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.2) - actionview (= 4.2.2) - activesupport (= 4.2.2) + actionpack (4.2.3) + actionview (= 4.2.3) + activesupport (= 4.2.3) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.2) - activesupport (= 4.2.2) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.3) + activesupport (= 4.2.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.2) - activesupport (= 4.2.2) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.3) + activesupport (= 4.2.3) globalid (>= 0.3.0) - activemodel (4.2.2) - activesupport (= 4.2.2) + activemodel (4.2.3) + activesupport (= 4.2.3) builder (~> 3.1) - activerecord (4.2.2) - activemodel (= 4.2.2) - activesupport (= 4.2.2) + activerecord (4.2.3) + activemodel (= 4.2.3) + activesupport (= 4.2.3) arel (~> 6.0) - activesupport (4.2.2) + activesupport (4.2.3) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -107,6 +107,7 @@ GEM thor (~> 0.19.1) formatador (0.2.5) gauntlt (0.1.4) + aruba cucumber nokogiri trollop @@ -205,16 +206,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.2) - actionmailer (= 4.2.2) - actionpack (= 4.2.2) - actionview (= 4.2.2) - activejob (= 4.2.2) - activemodel (= 4.2.2) - activerecord (= 4.2.2) - activesupport (= 4.2.2) + rails (4.2.3) + actionmailer (= 4.2.3) + actionpack (= 4.2.3) + actionview (= 4.2.3) + activejob (= 4.2.3) + activemodel (= 4.2.3) + activerecord (= 4.2.3) + activesupport (= 4.2.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.2) + railties (= 4.2.3) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -224,9 +225,9 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - railties (4.2.2) - actionpack (= 4.2.2) - activesupport (= 4.2.2) + railties (4.2.3) + actionpack (= 4.2.3) + activesupport (= 4.2.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.15.0) @@ -278,7 +279,7 @@ GEM eventmachine (~> 1.0.0) thin (~> 1.5.0) slop (3.6.0) - sprockets (3.3.1) + sprockets (3.3.2) rack (~> 1.0) sprockets-rails (2.3.2) actionpack (>= 3.0) @@ -349,7 +350,7 @@ DEPENDENCIES pry pry-rails rack-livereload - rails (= 4.2.2) + rails (= 4.2.3) rb-fsevent rspec-rails (= 2.14.2) sass-rails @@ -363,4 +364,4 @@ DEPENDENCIES unicorn BUNDLED WITH - 1.10.4 + 1.10.6 diff --git a/config/environments/production.rb b/config/environments/production.rb index 4300360..94c2767 100755 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -15,7 +15,7 @@ Railsgoat::Application.configure do # config.action_dispatch.rack_cache = true # Disable Rails's static asset server (Apache or nginx will already do this). - config.serve_static_assets = false + config.serve_static_files = false # Compress JavaScripts and CSS config.assets.compress = true diff --git a/config/environments/test.rb b/config/environments/test.rb index 3b1eb20..bd6b76c 100755 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -8,7 +8,7 @@ Railsgoat::Application.configure do config.cache_classes = true # Configure static asset server for tests with Cache-Control for performance. - config.serve_static_assets = true + config.serve_static_files = true config.static_cache_control = "public, max-age=3600" # Show full error reports and disable caching.