Merge branch 'update_secure_headers' into rails-3-develop

mysociety · May 8, 2015 · 3df3c0b · 3df3c0b
2 parents 9565fd3 + 1d27d02
commit 3df3c0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -28,7 +28,7 @@ gem 'rails-i18n', '~> 0.7.3'
 gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails'
 gem 'rmagick', '~> 2.14.0'
 gem 'ruby-msg', '~> 1.5.0',  :git => 'https://github.com/mysociety/ruby-msg.git'
-gem 'secure_headers', '~> 1.3.4'
+gem 'secure_headers', '~> 2.0.2'
 gem 'statistics2', '~> 0.54'
 gem 'syslog_protocol', '~> 0.9.2'
 gem 'thin', '~> 1.5.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -244,7 +244,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    secure_headers (1.3.4)
+    secure_headers (2.0.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -353,7 +353,7 @@ DEPENDENCIES
   ruby-debug (~> 0.10.4)
   ruby-msg (~> 1.5.0)!
   sass-rails (~> 3.2.3)
-  secure_headers (~> 1.3.4)
+  secure_headers (~> 2.0.2)
   spork-rails (~> 3.2.1)
   statistics2 (~> 0.54)
   syslog_protocol (~> 0.9.2)