diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-11-27 16:53:27 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-11-27 16:53:58 -0200 |
| commit | 31815d7167404557524712c665dda83505c094be (patch) | |
| tree | c1b74a6493c235afc1946c9d21a23f2e291c0ed4 | |
| parent | 2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13 (diff) | |
| download | rails-31815d7167404557524712c665dda83505c094be.tar.gz rails-31815d7167404557524712c665dda83505c094be.tar.bz2 rails-31815d7167404557524712c665dda83505c094be.zip | |
Revert "Test against rack master"
This reverts commit 2a4e14db981e38611667d407a975600ee720ada7.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 |
2 files changed, 2 insertions, 4 deletions
@@ -2,8 +2,6 @@ source 'https://rubygems.org' gemspec -gem 'rack', github: 'rack/rack' - # We need a newish Rake since Active Job sets its test tasks' descriptions. gem 'rake', '>= 10.3' 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, |