aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-11-27 16:53:27 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2014-11-27 16:53:58 -0200
commit31815d7167404557524712c665dda83505c094be (patch)
treec1b74a6493c235afc1946c9d21a23f2e291c0ed4 /railties/lib/rails/generators
parent2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13 (diff)
downloadrails-31815d7167404557524712c665dda83505c094be.tar.gz
rails-31815d7167404557524712c665dda83505c094be.tar.bz2
rails-31815d7167404557524712c665dda83505c094be.zip
Revert "Test against rack master"
This reverts commit 2a4e14db981e38611667d407a975600ee720ada7.
Diffstat (limited to 'railties/lib/rails/generators')
-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 b410363f2f..0823b0cc46 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.github('rack', 'rack/rack')]
+ [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)]
elsif options.edge?
- [GemfileEntry.github('rails', 'rails/rails'), GemfileEntry.github('rack', 'rack/rack')]
+ [GemfileEntry.github('rails', 'rails/rails')]
else
[GemfileEntry.version('rails',
Rails::VERSION::STRING,