Merge pull request #49145 from javierav/feature/assets-config
Do not generate configuration for sprockets if propshaft is used
This commit is contained in:
commit
fee7de5455
@ -5,8 +5,10 @@ Rails.application.config.assets.version = "1.0"
|
||||
|
||||
# Add additional assets to the asset load path.
|
||||
# Rails.application.config.assets.paths << Emoji.images_path
|
||||
<% if options[:asset_pipeline] == "sprockets" -%>
|
||||
|
||||
# Precompile additional assets.
|
||||
# application.js, application.css, and all non-JS/CSS in the app/assets
|
||||
# folder are already added.
|
||||
# Rails.application.config.assets.precompile += %w( admin.js admin.css )
|
||||
<% end -%>
|
||||
|
Loading…
Reference in New Issue
Block a user