kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

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

This reverts commit 5758387950.

Conflicts:
	railties/lib/rails/generators/app_base.rb

Reason: sprockets 2.9.1 fixes this issue
This commit is contained in:
Rafael Mendonça França 2013-04-18 14:07:18 -03:00
parent c072fcadd2
commit 2dc42e07c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
railties/lib/rails/generators/app_base.rb
View File

@ -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