diff options
author | José Valim <jose.valim@gmail.com> | 2012-05-02 03:07:49 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-05-02 03:07:49 -0700 |
commit | cf9f2842cc3392fc8c811c79e1acc72b54aad65a (patch) | |
tree | a61dcafa26700d2d5df9275fa67113fe3d162fb6 /railties/lib | |
parent | c0a7038412c60cf48274267f75bc4376e733dc69 (diff) | |
parent | 5eb32af28b16cf8d26ce291232239892154227d4 (diff) | |
download | rails-cf9f2842cc3392fc8c811c79e1acc72b54aad65a.tar.gz rails-cf9f2842cc3392fc8c811c79e1acc72b54aad65a.tar.bz2 rails-cf9f2842cc3392fc8c811c79e1acc72b54aad65a.zip |
Merge pull request #6111 from oscardelben/new_hash_syntax_in_gemfile
Use new hash syntax in generated Gemfile
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/app_base.rb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 64d8ed0684..6df33d65e9 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -137,24 +137,24 @@ module Rails def rails_gemfile_entry if options.dev? <<-GEMFILE.strip_heredoc - gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}' - gem 'journey', :github => 'rails/journey' - gem 'arel', :github => 'rails/arel' - gem 'active_record_deprecated_finders', :github => 'rails/active_record_deprecated_finders' + gem 'rails', path: '#{Rails::Generators::RAILS_DEV_PATH}' + gem 'journey', github: 'rails/journey' + gem 'arel', github: 'rails/arel' + gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders' GEMFILE elsif options.edge? <<-GEMFILE.strip_heredoc - gem 'rails', :github => 'rails/rails' - gem 'journey', :github => 'rails/journey' - gem 'arel', :github => 'rails/arel' - gem 'active_record_deprecated_finders', :github => 'rails/active_record_deprecated_finders' + gem 'rails', github: 'rails/rails' + gem 'journey', github: 'rails/journey' + gem 'arel', github: 'rails/arel' + gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders' GEMFILE else <<-GEMFILE.strip_heredoc gem 'rails', '#{Rails::VERSION::STRING}' # Bundle edge Rails instead: - # gem 'rails', :github => 'rails/rails' + # gem 'rails', github: 'rails/rails' GEMFILE end end @@ -194,9 +194,9 @@ module Rails # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git' - gem 'sass-rails', :git => 'https://github.com/rails/sass-rails.git' - gem 'coffee-rails', :git => 'https://github.com/rails/coffee-rails.git' + gem 'sprockets-rails', github: 'rails/sprockets-rails' + gem 'sass-rails', github: 'rails/sass-rails' + gem 'coffee-rails', github: 'rails/coffee-rails' # See https://github.com/sstephenson/execjs#readme for more supported runtimes #{javascript_runtime_gemfile_entry} @@ -208,7 +208,7 @@ module Rails # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git' + gem 'sprockets-rails', github: 'rails/sprockets-rails' gem 'sass-rails', '~> 4.0.0.beta' gem 'coffee-rails', '~> 4.0.0.beta' @@ -230,7 +230,7 @@ module Rails if defined?(JRUBY_VERSION) "gem 'therubyrhino'\n" else - "# gem 'therubyracer', :platform => :ruby\n" + "# gem 'therubyracer', platform: :ruby\n" end end |