From b395265f7c9fbb94a29d0934dd329690a02861df Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 23 Apr 2014 08:55:38 -0500 Subject: Revert "Edge Rails applications doesn't need to use arel master" This reverts commit 7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee. --- railties/lib/rails/generators/app_base.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, -- cgit v1.2.3