Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."

This reverts commit 5758387. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue
rails · Apr 18, 2013 · 2dc42e0 · 2dc42e0
1 parent c072fca
commit 2dc42e0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
@@ -188,15 +188,15 @@ def assets_gemfile_entry
             gem 'sass-rails', github: 'rails/sass-rails'
 
             # Use Uglifier as compressor for JavaScript assets
-            gem 'uglifier', '~> 1.3'
+            gem 'uglifier', '>= 1.3.0'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
             # Use SCSS for stylesheets
             gem 'sass-rails', '~> 4.0.0.beta1'
 
             # Use Uglifier as compressor for JavaScript assets
-            gem 'uglifier', '~> 1.3'
+            gem 'uglifier', '>= 1.3.0'
           GEMFILE
         end