diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-23 08:55:38 -0500 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-23 08:55:38 -0500 |
| commit | b395265f7c9fbb94a29d0934dd329690a02861df (patch) | |
| tree | f304eba7cc33a2084ab6bcc22f6f808b157ec269 | |
| parent | 86d6f05e695c545b7e744c958c8d740d0cdf5486 (diff) | |
| download | rails-b395265f7c9fbb94a29d0934dd329690a02861df.tar.gz rails-b395265f7c9fbb94a29d0934dd329690a02861df.tar.bz2 rails-b395265f7c9fbb94a29d0934dd329690a02861df.zip | |
Revert "Edge Rails applications doesn't need to use arel master"
This reverts commit 7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee.
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index c066f748ee..4ec471aad4 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -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, |