From 2dc42e07c7d83d8879f3b2d1d0a6ac924aa99020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 18 Apr 2013 14:07:18 -0300 Subject: Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet." This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue --- railties/lib/rails/generators/app_base.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 44fbd2f6bd..569180a680 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -188,7 +188,7 @@ module Rails 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 @@ -196,7 +196,7 @@ module Rails 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 -- cgit v1.2.3