diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-27 13:09:39 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-27 13:09:39 -0700 |
| commit | d684de49713aeae3ff492f554fa220c8ae3c57a1 (patch) | |
| tree | 1e3b45b47291dae7595a056f82e2ab9a079af9f8 /railties | |
| parent | 328c292abe39e28d22212ea33284fb3a65be9da8 (diff) | |
| parent | 4e35dc0ebec33905a05dca1fdeecc6a39e87e9cc (diff) | |
| download | rails-d684de49713aeae3ff492f554fa220c8ae3c57a1.tar.gz rails-d684de49713aeae3ff492f554fa220c8ae3c57a1.tar.bz2 rails-d684de49713aeae3ff492f554fa220c8ae3c57a1.zip | |
Merge pull request #9955 from rubys/cleanup_app_gemfile
Cosmetic cleanup of generated Gemfile
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 4e05c32f74..63e9b720a4 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -179,26 +179,16 @@ module Rails gemfile = if options.dev? || options.edge? <<-GEMFILE.gsub(/^ {12}/, '') - # Gems used only for assets and not required - # in production environments by default. - group :assets do - gem 'sprockets-rails', github: 'rails/sprockets-rails' - gem 'sass-rails', github: 'rails/sass-rails' - #{coffee_gemfile_entry if options[:skip_javascript]} - #{javascript_runtime_gemfile_entry(2) if options[:skip_javascript]} - gem 'uglifier', '>= 1.0.3' - end + # Gems used for assets + gem 'sprockets-rails', github: 'rails/sprockets-rails' + gem 'sass-rails', github: 'rails/sass-rails' + gem 'uglifier', '>= 1.0.3' GEMFILE else <<-GEMFILE.gsub(/^ {12}/, '') - # Gems used only for assets and not required - # in production environments by default. - group :assets do - gem 'sass-rails', '~> 4.0.0.beta1' - #{coffee_gemfile_entry if options[:skip_javascript]} - #{javascript_runtime_gemfile_entry(2) if options[:skip_javascript]} - gem 'uglifier', '>= 1.0.3' - end + # Gems used for assets + gem 'sass-rails', '~> 4.0.0.beta1' + gem 'uglifier', '>= 1.0.3' GEMFILE end |