aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-30 07:35:50 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-30 07:35:50 -0700
commit1e5ee397ff371720cc50fe6445b8f9f0a4cdbffc (patch)
treec4f9c052bcbaa2599ccdef96d178c5ac5a85394c
parent24444441b695d0b0d899f486e04dcdfdf9c64085 (diff)
parentbca866e6f1c1c044933ca71b7ae456e53c81dcf0 (diff)
downloadrails-1e5ee397ff371720cc50fe6445b8f9f0a4cdbffc.tar.gz
rails-1e5ee397ff371720cc50fe6445b8f9f0a4cdbffc.tar.bz2
rails-1e5ee397ff371720cc50fe6445b8f9f0a4cdbffc.zip
Merge pull request #10357 from arunagw/minor-code-deuplication-removed-app-generator
Minor code duplication removed
-rw-r--r--railties/lib/rails/generators/app_base.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 57dc7e797b..853d6fa4b9 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -186,20 +186,20 @@ module Rails
# Use SCSS for stylesheets
gem 'sass-rails', github: 'rails/sass-rails'
-
- # Use Uglifier as compressor for JavaScript assets
- gem 'uglifier', '>= 1.3.0'
GEMFILE
else
<<-GEMFILE.strip_heredoc
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.0.rc1'
-
- # Use Uglifier as compressor for JavaScript assets
- gem 'uglifier', '>= 1.3.0'
GEMFILE
end
+ gemfile += <<-GEMFILE.strip_heredoc
+
+ # Use Uglifier as compressor for JavaScript assets
+ gem 'uglifier', '>= 1.3.0'
+ GEMFILE
+
if options[:skip_javascript]
gemfile += <<-GEMFILE
#{coffee_gemfile_entry}