Commit 6a3b59f8 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'ce-9641-jira-connect-integration' into 'master'

Filter Jira shared secret from logs

See merge request gitlab-org/gitlab-ce!26077
parents b3535a3c 36c91555
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment