diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-02-15 20:31:06 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-02-15 20:31:06 +0000 |
| commit | 238781a68582958cd1f690c87e8f58364e7493d7 (patch) | |
| tree | 59bbd18b5083f8fccbcf193839dbb9338e308668 | |
| parent | efdde042a3299668957d16200a407b9daae52301 (diff) | |
| parent | efbe0768c35399ef58b6abac230adff6a1851088 (diff) | |
| download | gitlab-ce-238781a68582958cd1f690c87e8f58364e7493d7.tar.gz | |
Merge branch 'sh-filter-secret-variables' into 'master'
Filter secret variable values from logs
Closes #43313
See merge request gitlab-org/gitlab-ce!17159
| -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 c914e34b9c3..918bd4d57cf 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,6 +69,7 @@ module Gitlab # - Webhook URLs (:hook) # - Sentry DSN (:sentry_dsn) # - Deploy keys (:key) + # - Secret variable values (:value) config.filter_parameters += [/token$/, /password/, /secret/] config.filter_parameters += %i( certificate @@ -80,6 +81,7 @@ module Gitlab sentry_dsn trace variables + value ) # Enable escaping HTML in JSON. |