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

Revert "Edge Rails applications doesn't need to use arel master"

Browse source 
This reverts commit 7f62f30f58.
This commit is contained in:
Aaron Patterson 2014-04-23 08:55:38 -05:00
parent 86d6f05e69
commit b395265f7c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,7 +203,8 @@ module Rails
[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,