diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-13 13:48:49 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-13 16:29:07 +0300 |
| commit | 2d4c1c46b5a8ad6f310362792b8aeb7a639390af (patch) | |
| tree | 51793cedd04459256533e7d0f295614894df08eb /config | |
| parent | 2a3472f07c9db87605c143270c4ea7f587a1005b (diff) | |
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
Diffstat (limited to 'config')
| -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. |