aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschneems <richard.schneeman@gmail.com>2016-08-25 12:29:54 -0500
committerschneems <richard.schneeman@gmail.com>2016-08-29 13:16:07 -0500
commit58bd1124cf333f0e980dfbb31b38240d1004aa77 (patch)
treed12cc55ee00c72f9c3339b7bb6ca6c5ed2df78a6
parenta7256c30ae9fdbfc336f1556cccce2e0866cc1ad (diff)
downloadrails-58bd1124cf333f0e980dfbb31b38240d1004aa77.tar.gz
rails-58bd1124cf333f0e980dfbb31b38240d1004aa77.tar.bz2
rails-58bd1124cf333f0e980dfbb31b38240d1004aa77.zip
Move default to different initializer
Is this usage correct? cc/ @prathamesh-sonpatki
-rw-r--r--guides/source/upgrading_ruby_on_rails.md12
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt4
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt4
3 files changed, 4 insertions, 16 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 4530990280..2372590cec 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -1444,18 +1444,6 @@ config.public_file_server.headers = {
}
```
-### config/initializers/assets.rb
-
-In the most recent verison of sprockets-rails there is a flag available to configure what happens when
-an asset lookup is performed and no asset is found. By setting this value to false, an error will be
-raised so the asset lookup does not fail silently.
-
-```ruby
-# Unknown asset fallback will return the path passed in when the given
-# asset is not present in the asset pipeline.
-Rails.application.config.assets.unknown_asset_fallback = false
-```
-
### config/initializers/wrap_parameters.rb
Add this file with the following contents, if you wish to wrap parameters into a nested hash. This is on by default in new applications.
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 41f0fbf262..2318cf59ff 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
@@ -6,10 +6,6 @@ Rails.application.config.assets.version = '1.0'
# Add additional assets to the asset load path
# Rails.application.config.assets.paths << Emoji.images_path
-# Unknown asset fallback will return the path passed in when the given
-# asset is not present in the asset pipeline.
-Rails.application.config.assets.unknown_asset_fallback = false
-
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
index e539f4c457..4dbc3e771b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
@@ -32,3 +32,7 @@ ActiveSupport.halt_callback_chains_on_return_false = <%= options[:update] ? true
# Configure SSL options to enable HSTS with subdomains. Previous versions had false.
Rails.application.config.ssl_options = { hsts: { subdomains: true } }
<%- end -%>
+
+# Unknown asset fallback will return the path passed in when the given
+# asset is not present in the asset pipeline.
+Rails.application.config.assets.unknown_asset_fallback = false