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:
parent
46617f02c6
commit
193ec360b1
1 changed files with 8 additions and 2 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue