kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Rails master requires arel master

Browse source
This commit is contained in:
Rafael Mendonça França 2014-12-12 18:49:45 -02:00
parent 46617f02c6
commit 193ec360b1
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
railties/lib/rails/generators/app_base.rb
View file

@ -200,9 +200,15 @@ module Rails
def rails_gemfile_entry def rails_gemfile_entry
if options.dev? if options.dev?
[GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)] [
GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
GemfileEntry.github('arel', 'rails/arel')
]
elsif options.edge? elsif options.edge?
[GemfileEntry.github('rails', 'rails/rails')] [
GemfileEntry.github('rails', 'rails/rails'),
GemfileEntry.github('arel', 'rails/arel')
]
else else
[GemfileEntry.version('rails', [GemfileEntry.version('rails',
Rails::VERSION::STRING, Rails::VERSION::STRING,