Skip to content
Browse files

move config.assets.precompile into config/application.rb

  • Loading branch information...
1 parent ebae71a commit 304f4d4c25ccabdbf97d37dd7a92a54d0b63a9c9 @senny senny committed Feb 20, 2013
View
6 railties/CHANGELOG.md
@@ -1,5 +1,11 @@
## Rails 4.0.0 (unreleased) ##
+* The configuration option `config.assets.precompile` is no longer
+ in `config/environments/production.rb` but in
+ `config/application.rb`.
+
+ *Yves Senn*
+
* Add notice message for destroy action in scaffold generator.
*Rahul P. Chaudhari*
View
4 railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -31,6 +31,10 @@ class Application < Rails::Application
# Disable the asset pipeline.
config.assets.enabled = false
+<% else %>
+ # Precompile additional assets.
+ # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+ # config.assets.precompile += %w( search.js )
<% end -%>
end
end
View
6 railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -59,12 +59,6 @@
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.action_controller.asset_host = "http://assets.example.com"
- <%- unless options.skip_sprockets? -%>
- # Precompile additional assets.
- # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
- # config.assets.precompile += %w( search.js )
- <%- end -%>
-
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false

0 comments on commit 304f4d4

Please sign in to comment.
Something went wrong with that request. Please try again.