diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-08 10:43:11 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-08 10:55:16 -0200 |
| commit | 3debd57a951492eebbe40d509b88530a95d75602 (patch) | |
| tree | b0d99d89608d18b8b0919bda50f9335c47633fd2 /actionpack | |
| parent | 54faddf2a8342466ad1c685ceac46509ae1f110f (diff) | |
| download | rails-3debd57a951492eebbe40d509b88530a95d75602.tar.gz rails-3debd57a951492eebbe40d509b88530a95d75602.tar.bz2 rails-3debd57a951492eebbe40d509b88530a95d75602.zip | |
Bump rack dependency to 1.4.3
It includes security bug fixes and changes the initialization of
Rack::File to accept a hash, otherwise generating warnings.
See 295806e for the warnings fix.
Conflicts:
actionpack/actionpack.gemspec
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 2de084cfd6..523b4b212e 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,9 @@ ## Rails 3.2.11 (unreleased) ## +* Bump `rack` dependency to 1.4.3, eliminate `Rack::File` headers deprecation warning. + + *Sam Ruby + Carlos Antonio da Silva* + * Do not append second slash to root_url when using `trailing_slash: true` Fix #8700. Backport #8701. diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index ebd3c926eb..86e307255d 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.2') s.add_dependency('builder', '~> 3.0.0') - s.add_dependency('rack', '~> 1.4.0') + s.add_dependency('rack', '~> 1.4.3') s.add_dependency('rack-test', '~> 0.6.1') s.add_dependency('journey', '~> 1.0.4') s.add_dependency('sprockets', '~> 2.2.1') |