mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use :github option in Gemfile and make hashes consistent

This commit is contained in:
Piotr Sarnacki 2012-05-01 13:01:29 -07:00
parent c35fd3d306
commit 17f2958d85
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Gemfile
View File

@ -3,30 +3,30 @@ source 'https://rubygems.org'
gemspec gemspec
if ENV['AREL'] if ENV['AREL']
gem 'arel', :path => ENV['AREL'] gem 'arel', path: ENV['AREL']
else else
gem 'arel' gem 'arel'
end end
gem 'rack-test', :git => "git://github.com/brynary/rack-test.git" gem 'rack-test', github: "brynary/rack-test"
gem 'bcrypt-ruby', '~> 3.0.0' gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails' gem 'jquery-rails'
if ENV['JOURNEY'] if ENV['JOURNEY']
gem 'journey', :path => ENV['JOURNEY'] gem 'journey', path: ENV['JOURNEY']
else else
gem 'journey', :git => "git://github.com/rails/journey" gem 'journey', github: "rails/journey"
end end
if ENV['AR_DEPRECATED_FINDERS'] if ENV['AR_DEPRECATED_FINDERS']
gem 'active_record_deprecated_finders', path: ENV['AR_DEPRECATED_FINDERS'] gem 'active_record_deprecated_finders', path: ENV['AR_DEPRECATED_FINDERS']
else else
gem 'active_record_deprecated_finders', git: 'git://github.com/rails/active_record_deprecated_finders' gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'
end end
# This needs to be with require false to avoid # This needs to be with require false to avoid
# it being automatically loaded by sprockets # it being automatically loaded by sprockets
gem 'uglifier', '>= 1.0.3', :require => false gem 'uglifier', '>= 1.0.3', require: false
gem 'rake', '>= 0.8.7' gem 'rake', '>= 0.8.7'
gem 'mocha', '>= 0.11.2' gem 'mocha', '>= 0.11.2'
@ -36,7 +36,7 @@ group :doc do
# to a bug, but the PR that fixes it has been there # to a bug, but the PR that fixes it has been there
# for some weeks unapplied. As a temporary solution # for some weeks unapplied. As a temporary solution
# this is our own fork with the fix. # this is our own fork with the fix.
gem 'sdoc', :git => 'git://github.com/fxn/sdoc.git' gem 'sdoc', github: 'fxn/sdoc'
gem 'RedCloth', '~> 4.2' gem 'RedCloth', '~> 4.2'
gem 'w3c_validators' gem 'w3c_validators'
end end
@ -90,9 +90,9 @@ if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
gem 'ruby-oci8', '>= 2.0.4' gem 'ruby-oci8', '>= 2.0.4'
end end
if ENV['ORACLE_ENHANCED_PATH'] if ENV['ORACLE_ENHANCED_PATH']
gem 'activerecord-oracle_enhanced-adapter', :path => ENV['ORACLE_ENHANCED_PATH'] gem 'activerecord-oracle_enhanced-adapter', path: ENV['ORACLE_ENHANCED_PATH']
else else
gem 'activerecord-oracle_enhanced-adapter', :git => 'git://github.com/rsim/oracle-enhanced.git' gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced'
end end
end end

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

@ -138,23 +138,23 @@ module Rails
if options.dev? if options.dev?
<<-GEMFILE.strip_heredoc <<-GEMFILE.strip_heredoc
gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}' gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}'
gem 'journey', :git => 'https://github.com/rails/journey.git' gem 'journey', :github => 'rails/journey'
gem 'arel', :git => 'https://github.com/rails/arel.git' gem 'arel', :github => 'rails/arel'
gem 'active_record_deprecated_finders', :git => 'git://github.com/rails/active_record_deprecated_finders.git' gem 'active_record_deprecated_finders', :github => 'rails/active_record_deprecated_finders'
GEMFILE GEMFILE
elsif options.edge? elsif options.edge?
<<-GEMFILE.strip_heredoc <<-GEMFILE.strip_heredoc
gem 'rails', :git => 'https://github.com/rails/rails.git' gem 'rails', :github => 'rails/rails'
gem 'journey', :git => 'https://github.com/rails/journey.git' gem 'journey', :github => 'rails/journey'
gem 'arel', :git => 'https://github.com/rails/arel.git' gem 'arel', :github => 'rails/arel'
gem 'active_record_deprecated_finders', :git => 'git://github.com/rails/active_record_deprecated_finders.git' gem 'active_record_deprecated_finders', :github => 'rails/active_record_deprecated_finders'
GEMFILE GEMFILE
else else
<<-GEMFILE.strip_heredoc <<-GEMFILE.strip_heredoc
gem 'rails', '#{Rails::VERSION::STRING}' gem 'rails', '#{Rails::VERSION::STRING}'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'https://github.com/rails/rails.git' # gem 'rails', :github => 'rails/rails'
GEMFILE GEMFILE
end end
end end