diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-24 09:03:42 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-02-24 09:03:42 -0800 |
| commit | 5fc3b87c93edf770ea0d6b52a28ea225183dbfd7 (patch) | |
| tree | cd5912f275eae24d6521cb684075cb3a7f9456a8 | |
| parent | 149e3cd376caa23cf4d8c4b711b95e157186fc94 (diff) | |
| parent | 6bd1cae459d8635b10e839eed1c2bfc35ba2d1a2 (diff) | |
| download | rails-5fc3b87c93edf770ea0d6b52a28ea225183dbfd7.tar.gz rails-5fc3b87c93edf770ea0d6b52a28ea225183dbfd7.tar.bz2 rails-5fc3b87c93edf770ea0d6b52a28ea225183dbfd7.zip | |
Merge pull request #9398 from senny/revert_precompile_config_move
Revert "move config.assets.precompile into config/application.rb"
3 files changed, 6 insertions, 10 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 1d7513a84f..e2f2148911 100644 --- a/railties/CHANGELOG.md +++ b/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* diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 1275bce7e6..daf399a538 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -31,10 +31,6 @@ module <%= app_const_base %> # 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 diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 1f0111368b..0ab91d9864 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/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 |