Skip to content

Commit ea351f0

Browse files
committed
Do not generate configuration for sprockets if propshaft is used
1 parent 2fbb25b commit ea351f0

File tree

1 file changed

+2
-0
lines changed
  • railties/lib/rails/generators/rails/app/templates/config/initializers

1 file changed

+2
-0
lines changed

railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ Rails.application.config.assets.version = "1.0"
55

66
# Add additional assets to the asset load path.
77
# Rails.application.config.assets.paths << Emoji.images_path
8+
<% if options[:asset_pipeline] == "sprockets" -%>
89

910
# Precompile additional assets.
1011
# application.js, application.css, and all non-JS/CSS in the app/assets
1112
# folder are already added.
1213
# Rails.application.config.assets.precompile += %w( admin.js admin.css )
14+
<% end -%>

0 commit comments

Comments
 (0)