diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-13 10:48:49 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-03-13 10:48:49 +0000 |
| commit | 6a3b59f8f93438c81afe8826d136f03be4eb0aa6 (patch) | |
| tree | d8601dec9db01589deb6b74e7d81f0721b261277 | |
| parent | b3535a3c8bb8c928ddd4a49fd432984ee6d0d8ce (diff) | |
| parent | 36c91555b9780092e92699368fbc794244407ef0 (diff) | |
| download | gitlab-ce-6a3b59f8f93438c81afe8826d136f03be4eb0aa6.tar.gz | |
Merge branch 'ce-9641-jira-connect-integration' into 'master'
Filter Jira shared secret from logs
See merge request gitlab-org/gitlab-ce!26077
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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. |