aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-03-05 16:53:52 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-03-05 16:53:52 -0300
commit1d02fb6e376c6f7224a5534d574e63dd9708cdd2 (patch)
tree3a2120a65a96cf27e45db4a06b7d12ffeaf847c1 /railties/lib/rails
parent2fcd57b066e54f86470648cb13df5d0547b4f24a (diff)
parent722227a6f63b0a2fc45bd150a0dd6de3b7878c46 (diff)
downloadrails-1d02fb6e376c6f7224a5534d574e63dd9708cdd2.tar.gz
rails-1d02fb6e376c6f7224a5534d574e63dd9708cdd2.tar.bz2
rails-1d02fb6e376c6f7224a5534d574e63dd9708cdd2.zip
Merge pull request #24070 from y-yagi/remove_unnecessary_config_in_sprockets-rails-3
remove config that are no longer needed in sprockets-rails 3
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt9
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt4
2 files changed, 0 insertions, 13 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 e6a2de0928..7a537610e9 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,15 +46,6 @@ Rails.application.configure do
# This option may cause significant delays in view rendering with a large
# number of complex assets.
config.assets.debug = true
-
- # Asset digests allow you to set far-future HTTP expiration dates on all assets,
- # yet still be able to expire them through the digest params.
- config.assets.digest = true
-
- # Adds additional error checking when serving assets at runtime.
- # Checks for improperly declared sprockets dependencies.
- # Raises helpful error messages.
- config.assets.raise_runtime_errors = true
<%- end -%>
# Raises error for missing translations
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 5205c0ef0a..d2d0529d98 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -26,10 +26,6 @@ Rails.application.configure do
# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
- # Asset digests allow you to set far-future HTTP expiration dates on all assets,
- # yet still be able to expire them through the digest params.
- config.assets.digest = true
-
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
<%- end -%>