diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-22 23:26:26 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-22 23:26:26 -0800 |
| commit | d4248fa02af38a8cdec5ddcad556b258e54a30bf (patch) | |
| tree | adfe5b3d2149e9b949c283afd6807a7c658e8fe8 | |
| parent | 2b74a13a4b4d6b8d21e58e49a33872baa95d3b4a (diff) | |
| parent | c075ca460066b8240a99c8c4d791f8c413913960 (diff) | |
| download | rails-d4248fa02af38a8cdec5ddcad556b258e54a30bf.tar.gz rails-d4248fa02af38a8cdec5ddcad556b258e54a30bf.tar.bz2 rails-d4248fa02af38a8cdec5ddcad556b258e54a30bf.zip | |
Merge pull request #4610 from lest/patch-2
use rack 1.4.1
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
3 files changed, 1 insertions, 5 deletions
@@ -2,8 +2,6 @@ source 'https://rubygems.org' gemspec -gem 'rack', :git => 'git://github.com/rack/rack.git' - if ENV['AREL'] gem 'arel', :path => ENV['AREL'] else diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 4ce0624207..f13b1d5a60 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency('activemodel', version) s.add_dependency('rack-cache', '~> 1.1') s.add_dependency('builder', '~> 3.0.0') - s.add_dependency('rack', '~> 1.4.0') + s.add_dependency('rack', '~> 1.4.1') s.add_dependency('rack-test', '~> 0.6.1') s.add_dependency('journey', '~> 1.0.0') s.add_dependency('sprockets', '~> 2.2.0') diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 712068a942..5e9c385ab8 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -2,8 +2,6 @@ source 'https://rubygems.org' <%= rails_gemfile_entry -%> -gem 'rack', :git => 'https://github.com/rack/rack.git' - <%= database_gemfile_entry -%> <%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%> |