diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-05-08 11:00:01 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-05-08 11:00:01 +0100 |
| commit | 3df3c0bfc8c7afe964c7363bed9a02ee7ada06e1 (patch) | |
| tree | 15fbb7fe00dae4e9922c1f5053f51e91d11dd3e8 | |
| parent | 9565fd3038751713e2a1a1da3fe246dcc6e35742 (diff) | |
| parent | 1d27d027a32f618a5dbc24c5f04cf85d56fe74a7 (diff) | |
Merge branch 'update_secure_headers' into rails-3-develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 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) |