aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-06-17 10:07:30 +0100
committerLouise Crow <louise.crow@gmail.com>2015-06-17 10:07:30 +0100
commit93fdad62a6b6cdcb6769b7fefa45d1bada46fb8f (patch)
tree052e15f7d82392facc6748694e1bfd6d25a33b20
parentfd37107ea21777514550152bb87a1bb42bb6bdb3 (diff)
Upgrade rack to get the fix for CVE-2015-3225.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 3bcab2a9a..6f819c831 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'memcache-client', '~> 1.8.5'
gem 'net-http-local', '~> 0.1.2', :platforms => [:ruby_18, :ruby_19]
gem 'net-purge', '~> 0.1.0'
gem 'open4', '~> 1.3.4'
-gem 'rack', '~> 1.4.5'
+gem 'rack', '~> 1.4.6'
if RUBY_VERSION.to_f >= 1.9
gem 'rack-utf8_sanitizer', '~> 1.3.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 24402bca6..7a5fd13ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,7 @@ GEM
slop (~> 3.4)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
- rack (1.4.5)
+ rack (1.4.6)
rack-cache (1.2)
rack (>= 0.4)
rack-protection (1.5.0)
@@ -343,7 +343,7 @@ DEPENDENCIES
pg (~> 0.17.1)
pry (~> 0.9.6)
quiet_assets (~> 1.0.2)
- rack (~> 1.4.5)
+ rack (~> 1.4.6)
rack-utf8_sanitizer (~> 1.3.0)
rails (= 3.2.21)
rails-i18n (~> 0.7.3)