summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-09-11 14:18:33 +0000
committerRobert Speicher <robert@gitlab.com>2017-09-11 14:18:33 +0000
commit7baa77494f34e326f0b920336fd48fb5d17ccd47 (patch)
tree9662e303706cc557d6177abccf134230e0b6424b /config
parent90f83ca487cb64a5244709994e3220cfca2453d4 (diff)
parent66882ff3656607abae4157ac4210597f75aff2dc (diff)
downloadgitlab-ce-7baa77494f34e326f0b920336fd48fb5d17ccd47.tar.gz
Merge branch 'sh-filter-runner-token' into 'master'
Expand filtered parameters to include `token` See merge request !14174
Diffstat (limited to 'config')
-rw-r--r--config/application.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb
index 32a290f2002..da9bb25c8b9 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -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