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

Rails master requires arel master

This commit is contained in:
Rafael Mendonça França 2014-12-12 18:49:45 -02:00
parent 46617f02c6
commit 193ec360b1

View file

@ -200,9 +200,15 @@ module Rails
def rails_gemfile_entry
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?
[GemfileEntry.github('rails', 'rails/rails')]
[
GemfileEntry.github('rails', 'rails/rails'),
GemfileEntry.github('arel', 'rails/arel')
]
else
[GemfileEntry.version('rails',
Rails::VERSION::STRING,