diff options
| author | Ganesh Kumar <ganesh@Ganeshs-iMac-5.local> | 2011-04-27 19:14:42 +0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-27 20:50:09 +0800 |
| commit | bd2444d1a887b310489a0e562d65dca309c1a141 (patch) | |
| tree | 1a5adc7f591ac564b61408d1fcd63d1c48cb2a37 /railties | |
| parent | e8c1031092d2c81fb420486e3c62b3531547bd52 (diff) | |
| download | rails-bd2444d1a887b310489a0e562d65dca309c1a141.tar.gz rails-bd2444d1a887b310489a0e562d65dca309c1a141.tar.bz2 rails-bd2444d1a887b310489a0e562d65dca309c1a141.zip | |
enable uglifier gem as new version of execjs is relased
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 9f2346028a..8ad64e38ed 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -8,7 +8,7 @@ source 'http://rubygems.org' <%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%> gem 'sass' gem 'coffee-script' -# gem 'uglifier' +gem 'uglifier' # Use unicorn as the web server # gem 'unicorn' 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 ce28e41b91..b00f10c545 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 @@ -16,7 +16,7 @@ config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx # Compress both stylesheets and JavaScripts - # config.assets.js_compressor = :uglifier + config.assets.js_compressor = :uglifier config.assets.css_compressor = :scss # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. |