diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-20 08:18:08 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-20 08:18:08 -0800 |
| commit | b85f63bbd00243787387d9c32901131851e8e424 (patch) | |
| tree | 49d10590f59343417260ed0b99169e25c85ab2ba /railties | |
| parent | 3a0b6c8e135e268c1550f93db1b63ba27457dec2 (diff) | |
| parent | 304f4d4c25ccabdbf97d37dd7a92a54d0b63a9c9 (diff) | |
| download | rails-b85f63bbd00243787387d9c32901131851e8e424.tar.gz rails-b85f63bbd00243787387d9c32901131851e8e424.tar.bz2 rails-b85f63bbd00243787387d9c32901131851e8e424.zip | |
Merge pull request #9341 from senny/move_precompiled_asset_config_to_application
move config.assets.precompile into config/application.rb
Diffstat (limited to 'railties')
3 files changed, 10 insertions, 6 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index e2f2148911..1d7513a84f 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -3,6 +3,12 @@ *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 daf399a538..1275bce7e6 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -31,6 +31,10 @@ 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 0ab91d9864..1f0111368b 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,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 |