diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-18 14:07:18 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-18 14:21:28 -0300 |
| commit | 2dc42e07c7d83d8879f3b2d1d0a6ac924aa99020 (patch) | |
| tree | c720f93c700a8ed2f69c54a77a65be0ffb3b4cf2 /railties/lib/rails | |
| parent | c072fcadd291b402d58b76ce34626234418b190f (diff) | |
| download | rails-2dc42e07c7d83d8879f3b2d1d0a6ac924aa99020.tar.gz rails-2dc42e07c7d83d8879f3b2d1d0a6ac924aa99020.tar.bz2 rails-2dc42e07c7d83d8879f3b2d1d0a6ac924aa99020.zip | |
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
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |