diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-12 18:49:45 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-12 18:49:45 -0200 |
| commit | 193ec360b1b082003f3eb486b533d4cf218571c7 (patch) | |
| tree | 61827d493d2eff861288e6fbf8c2ed427db55891 /railties | |
| parent | 46617f02c6e473b7e695330076d2039de1c9aff2 (diff) | |
| download | rails-193ec360b1b082003f3eb486b533d4cf218571c7.tar.gz rails-193ec360b1b082003f3eb486b533d4cf218571c7.tar.bz2 rails-193ec360b1b082003f3eb486b533d4cf218571c7.zip | |
Rails master requires arel master
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 4ed7f8ddf5..5fb4723ef7 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -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, |