Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Revert "move config.assets.precompile into config/application.rb" #9398

Merged
merged 1 commit into from

2 participants

@senny
Owner

This reverts commit 304f4d4.

As it turns out everything should behave as it did and we don't
need to move this configuration option.

@senny senny Revert "move config.assets.precompile into config/application.rb"
This reverts commit 304f4d4.

As it turns out everything should behave as it did and we don't
need to move this configuration option.
6bd1cae
@guilleiguaran guilleiguaran merged commit 5fc3b87 into from
@senny senny deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 24, 2013
  1. @senny

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

    senny authored
    This reverts commit 304f4d4.
    
    As it turns out everything should behave as it did and we don't
    need to move this configuration option.
This page is out of date. Refresh to see the latest.
View
6 railties/CHANGELOG.md
@@ -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*
View
4 railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -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
View
6 railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -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
Something went wrong with that request. Please try again.