mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Test against rack master" 

This reverts commit 2a4e14db98.
This commit is contained in:
Santiago Pastorino 2014-11-27 16:53:27 -02:00
parent 2e4c9c2ee5
commit 31815d7167
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -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'

4
railties/lib/rails/generators/app_base.rb
View File

@ -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,