diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-07-08 11:46:56 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-07-08 11:46:56 -0700 |
| commit | 97d62a32f824ca54c6dee2033decb78f85217361 (patch) | |
| tree | 7c7fc50df28335550aefba8c917777d784fcccc3 /railties/lib/rails | |
| parent | 3116dac121df6d2c9e1db683a9a95b56bd203b12 (diff) | |
| parent | 46890ad18840a3f311bf3bf68e03cc605ca7bf12 (diff) | |
| download | rails-97d62a32f824ca54c6dee2033decb78f85217361.tar.gz rails-97d62a32f824ca54c6dee2033decb78f85217361.tar.bz2 rails-97d62a32f824ca54c6dee2033decb78f85217361.zip | |
Merge pull request #13999 from jamox/update_rack
This updates rails to use edge rack
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 76f8a1b816..20e512a7ff 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -203,10 +203,12 @@ module Rails def rails_gemfile_entry if options.dev? [GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH), - GemfileEntry.github('arel', 'rails/arel')] + GemfileEntry.github('arel', 'rails/arel'), + GemfileEntry.github('rack', 'rack/rack')] elsif options.edge? [GemfileEntry.github('rails', 'rails/rails'), - GemfileEntry.github('arel', 'rails/arel')] + GemfileEntry.github('arel', 'rails/arel'), + GemfileEntry.github('rack', 'rack/rack')] else [GemfileEntry.version('rails', Rails::VERSION::STRING, |