aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-03-26 22:18:53 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-03-26 22:18:53 -0300
commit7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee (patch)
tree6d3d1d2693b5447b2244a5c50220ff6fdf5960fc /railties
parent054e2c42a532d4f160bdb36d2b3864880c16ce4b (diff)
downloadrails-7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee.tar.gz
rails-7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee.tar.bz2
rails-7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee.zip
Edge Rails applications doesn't need to use arel master
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/app_base.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index dd1438800c..2fb49479fe 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -203,8 +203,7 @@ 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('arel', 'rails/arel')]
+ [GemfileEntry.github('rails', 'rails/rails')]
else
[GemfileEntry.version('rails',
Rails::VERSION::STRING,