Permalink
Browse files

Merge pull request #9398 from senny/revert_precompile_config_move

Revert "move config.assets.precompile into config/application.rb"
  • Loading branch information...
2 parents 149e3cd + 6bd1cae commit 5fc3b87c93edf770ea0d6b52a28ea225183dbfd7 @guilleiguaran guilleiguaran committed Feb 24, 2013
View
@@ -3,12 +3,6 @@
*Terence Lee*
-* 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*
@@ -31,10 +31,6 @@ 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
@@ -59,6 +59,12 @@
# 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 5fc3b87

Please sign in to comment.