aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-06-16 17:01:55 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-06-16 17:01:55 -0400
commit7291178265a98af7c443b0bfe6ebb34e0f157de8 (patch)
tree8512f74c12a4725a229c8885ff91b0b5072e6a85 /railties
parent2ff5a1755f12e417371d1b3c0e0f9b690fa57ab5 (diff)
downloadrails-7291178265a98af7c443b0bfe6ebb34e0f157de8.tar.gz
rails-7291178265a98af7c443b0bfe6ebb34e0f157de8.tar.bz2
rails-7291178265a98af7c443b0bfe6ebb34e0f157de8.zip
Move quiet option to development.rb
This option is used in a initializer hook that runs before the config/initializers files so it will not work if it is set there.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt3
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt3
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
index 7a537610e9..f3ccf95045 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
@@ -46,6 +46,9 @@ Rails.application.configure do
# This option may cause significant delays in view rendering with a large
# number of complex assets.
config.assets.debug = true
+
+ # Suppress logger output for asset requests.
+ config.assets.quiet = true
<%- end -%>
# Raises error for missing translations
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
index fa63e48fdf..01ef3e6630 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
@@ -9,6 +9,3 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# Rails.application.config.assets.precompile += %w( search.js )
-
-# Suppress logger output for asset requests.
-Rails.application.config.assets.quiet = true