diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-17 19:17:49 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-17 19:17:49 -0700 |
| commit | f4c6ecc17c45a9ce8b85c503f998675fbf5d6204 (patch) | |
| tree | e5e8bcdb0e03c7a335fe51c5c94857339f90bedc /railties/lib/rails/generators/rails | |
| parent | d7f8b2a06811ca3266946b1e6bef27cd5ce09762 (diff) | |
| parent | b8c7e31a573315b5b718ccf45f3197d6250ac4a2 (diff) | |
| download | rails-f4c6ecc17c45a9ce8b85c503f998675fbf5d6204.tar.gz rails-f4c6ecc17c45a9ce8b85c503f998675fbf5d6204.tar.bz2 rails-f4c6ecc17c45a9ce8b85c503f998675fbf5d6204.zip | |
Merge pull request #7964 from josh/josh-sprockets-rails
Switch to new sprockets-rails plugin
Diffstat (limited to 'railties/lib/rails/generators/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index 6b5b3a0b1f..bd0a0d44b8 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -32,9 +32,6 @@ <%- end -%> <%- unless options.skip_sprockets? -%> - # Do not compress assets. - config.assets.compress = false - # Debug mode disables concatenation and preprocessing of assets. config.assets.debug = true <%- 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 8aaaba628c..14422e275e 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 @@ -24,7 +24,8 @@ <%- unless options.skip_sprockets? -%> # Compress JavaScripts and CSS. - config.assets.compress = true + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass # Don't fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false @@ -61,7 +62,7 @@ <%- 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. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. # config.action_mailer.raise_delivery_errors = false # Enable threaded mode. |