Merge branch 'sh-filter-runner-token' into 'master'

Expand filtered parameters to include `token`

See merge request !14174
This commit is contained in:
Robert Speicher 2017-09-11 14:18:33 +00:00
commit 7baa77494f
1 changed files with 2 additions and 2 deletions

View File

@ -51,7 +51,7 @@ module Gitlab
# Configure sensitive parameters which will be filtered from the log file.
#
# Parameters filtered:
# - Any parameter ending with `_token`
# - Any parameter ending with `token`
# - Any parameter containing `password`
# - Any parameter containing `secret`
# - Two-factor tokens (:otp_attempt)
@ -61,7 +61,7 @@ module Gitlab
# - Webhook URLs (:hook)
# - Sentry DSN (:sentry_dsn)
# - Deploy keys (:key)
config.filter_parameters += [/_token$/, /password/, /secret/]
config.filter_parameters += [/token$/, /password/, /secret/]
config.filter_parameters += %i(
certificate
encrypted_key