Permalink
Browse files

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

This reverts commit 7f62f30.
  • Loading branch information...
1 parent 86d6f05 commit b395265f7c9fbb94a29d0934dd329690a02861df @tenderlove tenderlove committed Apr 23, 2014
Showing with 2 additions and 1 deletion.
  1. +2 −1 railties/lib/rails/generators/app_base.rb
@@ -203,7 +203,8 @@ def rails_gemfile_entry
[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,

0 comments on commit b395265

Please sign in to comment.