aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-26 16:17:51 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-26 16:17:51 -0200
commit2a4e14db981e38611667d407a975600ee720ada7 (patch)
tree4ee5a058bcf8a12d14d3e3694e9eb38c86a5637b /railties
parent13cb45452a12d03f07255931b9b4ea050c1b0644 (diff)
downloadrails-2a4e14db981e38611667d407a975600ee720ada7.tar.gz
rails-2a4e14db981e38611667d407a975600ee720ada7.tar.bz2
rails-2a4e14db981e38611667d407a975600ee720ada7.zip
Test against rack master
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/app_base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 0823b0cc46..b410363f2f 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -195,9 +195,9 @@ 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('rack', 'rack/rack')]
elsif options.edge?
- [GemfileEntry.github('rails', 'rails/rails')]
+ [GemfileEntry.github('rails', 'rails/rails'), GemfileEntry.github('rack', 'rack/rack')]
else
[GemfileEntry.version('rails',
Rails::VERSION::STRING,