aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-05-08 11:00:01 +0100
committerGareth Rees <gareth@mysociety.org>2015-05-08 11:00:01 +0100
commit3df3c0bfc8c7afe964c7363bed9a02ee7ada06e1 (patch)
tree15fbb7fe00dae4e9922c1f5053f51e91d11dd3e8 /Gemfile.lock
parent9565fd3038751713e2a1a1da3fe246dcc6e35742 (diff)
parent1d27d027a32f618a5dbc24c5f04cf85d56fe74a7 (diff)
Merge branch 'update_secure_headers' into rails-3-develop
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b9e0f3380..9353b9145 100644
--- 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)