diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-10-24 23:46:06 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 23:46:06 -0200 |
| commit | aad14c92990551cdd4d0d536b1944b17098480c7 (patch) | |
| tree | e0fe182dc5f71c55af5b88e64b5b41886cd5bc72 /railties/lib/rails/generators/rails | |
| parent | be623bf55fee51f26d38f96cbba46b95b1933c4c (diff) | |
| parent | 5b54a904101c48aac9467df1f060b83c67bee832 (diff) | |
| download | rails-aad14c92990551cdd4d0d536b1944b17098480c7.tar.gz rails-aad14c92990551cdd4d0d536b1944b17098480c7.tar.bz2 rails-aad14c92990551cdd4d0d536b1944b17098480c7.zip | |
Merge pull request #26883 from y-yagi/remove_assets_config_if_skip_sprockets_is_true
remove assets config from `new_framework_defaults` if `--skip-sprockets` is true
Diffstat (limited to 'railties/lib/rails/generators/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt | 2 |
1 files changed, 2 insertions, 0 deletions
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 5ad18cc5ad..3ad3eba98a 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,7 +32,9 @@ 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 -%> +<%- unless options[:skip_sprockets] -%> # 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 = <%= options[:update] ? true : false %> +<%- end -%> |