diff options
| author | Jarmo Isotalo <jamo@isotalo.fi> | 2014-02-08 15:30:14 -0800 |
|---|---|---|
| committer | Jarmo Isotalo <jamo@isotalo.fi> | 2014-05-19 00:03:08 +0300 |
| commit | adffea62b5dc494e0e6bc2ca256bb592ce85f112 (patch) | |
| tree | 15c1256914f887bc5b56442eef7b25cd20425822 /railties/lib/rails | |
| parent | d29074af7a3da82ec4bab4f96ab802edeaa1cdb4 (diff) | |
| download | rails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.tar.gz rails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.tar.bz2 rails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.zip | |
Upgraded rack
As Rack has some non backwards compatible changes added required
modifications to keep behaviour in rails close to same as before.
Also modified generators to include rack/rack for not yet released
version of 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 569afe8104..8447d02785 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -200,10 +200,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, |