From 2d4c1c46b5a8ad6f310362792b8aeb7a639390af Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 13 Mar 2019 10:48:49 +0000
Subject: Merge branch 'ce-9641-jira-connect-integration' into 'master'

Filter Jira shared secret from logs

See merge request gitlab-org/gitlab-ce!26077

(cherry picked from commit 6a3b59f8f93438c81afe8826d136f03be4eb0aa6)

36c91555 Filter Jira shared secret from logs
---
 config/application.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/application.rb b/config/application.rb
index 1c11e347281..6bdf61edfb1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -94,6 +94,7 @@ module Gitlab
     # - Webhook URLs (:hook)
     # - Sentry DSN (:sentry_dsn)
     # - File content from Web Editor (:content)
+    # - Jira shared secret (:sharedSecret)
     #
     # NOTE: It is **IMPORTANT** to also update gitlab-workhorse's filter when adding parameters here to not
     #       introduce another security vulnerability: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/182
@@ -108,6 +109,7 @@ module Gitlab
       trace
       variables
       content
+      sharedSecret
     )
 
     # Enable escaping HTML in JSON.
-- 
cgit v1.2.3