Skip to content
Browse files

Rails 4.0 is going to depend on Rack 1.5.x so let's test against Rack…

… master
  • Loading branch information...
1 parent 2b773e1 commit 1a791e7502fc423b2bcf3ad4350d366b87c504d7 @spastorino spastorino committed Dec 31, 2012
Showing with 3 additions and 0 deletions.
  1. +1 −0 Gemfile
  2. +2 −0 railties/lib/rails/generators/app_base.rb
View
1 Gemfile
@@ -5,6 +5,7 @@ gemspec
gem 'arel', github: 'rails/arel', branch: 'master'
gem 'mocha', '~> 0.13.0', require: false
+gem 'rack', github: 'rack/rack'
gem 'rack-test', github: 'brynary/rack-test'
gem 'rack-cache', '~> 1.2'
gem 'bcrypt-ruby', '~> 3.0.0'
View
2 railties/lib/rails/generators/app_base.rb
@@ -138,12 +138,14 @@ def rails_gemfile_entry
if options.dev?
<<-GEMFILE.strip_heredoc
gem 'rails', path: '#{Rails::Generators::RAILS_DEV_PATH}'
+ gem 'rack', github: 'rack/rack'
gem 'arel', github: 'rails/arel'
gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
GEMFILE
elsif options.edge?
<<-GEMFILE.strip_heredoc
gem 'rails', github: 'rails/rails'
+ gem 'rack', github: 'rack/rack'
gem 'arel', github: 'rails/arel'
gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders'
GEMFILE

0 comments on commit 1a791e7

Please sign in to comment.
Something went wrong with that request. Please try again.