diff options
| author | schneems <richard.schneeman@gmail.com> | 2016-08-25 12:29:54 -0500 |
|---|---|---|
| committer | schneems <richard.schneeman@gmail.com> | 2016-08-29 13:16:07 -0500 |
| commit | 58bd1124cf333f0e980dfbb31b38240d1004aa77 (patch) | |
| tree | d12cc55ee00c72f9c3339b7bb6ca6c5ed2df78a6 /railties | |
| parent | a7256c30ae9fdbfc336f1556cccce2e0866cc1ad (diff) | |
| download | rails-58bd1124cf333f0e980dfbb31b38240d1004aa77.tar.gz rails-58bd1124cf333f0e980dfbb31b38240d1004aa77.tar.bz2 rails-58bd1124cf333f0e980dfbb31b38240d1004aa77.zip | |
Move default to different initializer
Is this usage correct? cc/ @prathamesh-sonpatki
Diffstat (limited to 'railties')
2 files changed, 4 insertions, 4 deletions
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 |