summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-18 21:29:04 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-18 21:29:04 +0000
commit9065f9c5ff073d376eb6377ca63ead93623fc8a3 (patch)
treea890b8375d7a996a50f437c64a87ce052e63d309 /Gemfile.lock
parentf0b446e55506b251e85afd4bb063586bccb52eb2 (diff)
parentc2fe22f8f419a8e562f0f34e8c0f478aefc34ec0 (diff)
downloadgitlab-ce-9065f9c5ff073d376eb6377ca63ead93623fc8a3.tar.gz
Merge branch 'csp-basics' into 'master'
Content Security Policy Ref: #18231 This uses twitter's [secure_headers gem](https://github.com/twitter/secureheaders). See merge request !4770
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ec5fe12820..f3f4d895ae4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -645,6 +645,8 @@ GEM
sdoc (0.3.20)
json (>= 1.1.3)
rdoc (~> 3.10)
+ secure_headers (3.3.2)
+ useragent
seed-fu (2.3.6)
activerecord (>= 3.1)
activesupport (>= 3.1)
@@ -767,6 +769,7 @@ GEM
get_process_mem (~> 0)
unicorn (>= 4, < 6)
uniform_notifier (1.9.0)
+ useragent (0.16.7)
uuid (2.3.8)
macaddr (~> 1.0)
version_sorter (2.0.0)
@@ -944,6 +947,7 @@ DEPENDENCIES
sass-rails (~> 5.0.0)
scss_lint (~> 0.47.0)
sdoc (~> 0.3.20)
+ secure_headers (~> 3.3)
seed-fu (~> 2.3.5)
select2-rails (~> 3.5.9)
sentry-raven (~> 1.1.0)