From 05ce0007db9361a2b777bc7378e395dafb199fd3 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 24 Apr 2011 20:34:22 -0500
Subject: [PATCH] Temporarily disable uglifier until a new version depending on
 execjs 0.2.0 can be released (tomorrow?)

---
 railties/lib/rails/generators/rails/app/templates/Gemfile       | 2 +-
 .../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 141d9fd15c..97c2258d09 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', '~> 3.1.0.alpha'
 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 b00f10c545..ce28e41b91 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.