summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-06-30 16:18:05 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-06-30 16:18:05 -0600
commiteb70f051a6fb69542aa4436d808bf32271219da8 (patch)
treefcc354c27d01fde266e1a882783c4373cd272aa1
parent44230e12bb2a7ea3d91a6a9a2bfd1543198f1b9b (diff)
downloadgitlab-ce-upgrade-sprockets-rails.tar.gz
Remove quiet_assets in favor of built-in sprockets-rails config.upgrade-sprockets-rails
quiet_assets has been seemingly abandoned, and now sprockets-rails has the feature built-in! From this PR: https://github.com/rails/sprockets-rails/pull/355
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
-rw-r--r--config/environments/development.rb3
3 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 5213a59cab0..58efe6a2525 100644
--- a/Gemfile
+++ b/Gemfile
@@ -251,7 +251,6 @@ group :development do
gem 'brakeman', '~> 3.3.0', require: false
gem 'letter_opener_web', '~> 1.3.0'
- gem 'quiet_assets', '~> 1.0.2'
gem 'rerun', '~> 0.11.0'
gem 'bullet', require: false
gem 'rblineprof', platform: :mri, require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e5554d4fc9..b1f2c8c142c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -499,8 +499,6 @@ GEM
pry-rails (0.3.4)
pry (>= 0.9.10)
pyu-ruby-sasl (0.0.3.3)
- quiet_assets (1.0.3)
- railties (>= 3.1, < 5.0)
rack (1.6.4)
rack-accept (0.4.5)
rack (>= 0.4)
@@ -920,7 +918,6 @@ DEPENDENCIES
poltergeist (~> 1.9.0)
premailer-rails (~> 1.9.0)
pry-rails
- quiet_assets (~> 1.0.2)
rack-attack (~> 4.3.1)
rack-cors (~> 0.4.0)
rack-oauth2 (~> 1.2.1)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8cca0039b4a..45a8c1add3e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -42,4 +42,7 @@ Rails.application.configure do
config.action_mailer.preview_path = 'spec/mailers/previews'
config.eager_load = false
+
+ # Do not log asset requests
+ config.assets.quiet = true
end