From 3ee8eb113d019df8e5312af42fb2f369577c324c Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Tue, 5 Jul 2016 15:15:29 -0600
Subject: [PATCH] Only report to Sentry when it's enabled.

---
 config/initializers/secure_headers.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index e69117e0521..6cc7484d748 100644
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -1,8 +1,12 @@
 require 'gitlab/current_settings'
 include Gitlab::CurrentSettings
 
-uri = URI.parse(current_application_settings.sentry_dsn)
-CSP_REPORT_URI = "#{uri.scheme}://#{uri.host}/api#{uri.path}/csp-report/?sentry_key=#{uri.user}"
+if Rails.env.production? && current_application_settings.sentry_enabled
+  uri = URI.parse(current_application_settings.sentry_dsn)
+  CSP_REPORT_URI = "#{uri.scheme}://#{uri.host}/api#{uri.path}/csp-report/?sentry_key=#{uri.user}"
+else
+  CSP_REPORT_URI = ''
+end
 
 SecureHeaders::Configuration.default do |config|
   config.cookies = {
-- 
GitLab