diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-11 14:18:33 +0000 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-12 13:01:54 +0200 |
| commit | 77292ef6c3748ea0b5ae1b8bd04e43b209eedb6f (patch) | |
| tree | c69af46a88f1d5bfd734f83f427c21062d84dcaa | |
| parent | 068414754dd1f45a8c4139f1d4b9148c852ccae6 (diff) | |
| download | gitlab-ce-77292ef6c3748ea0b5ae1b8bd04e43b209eedb6f.tar.gz | |
Merge branch 'sh-filter-runner-token' into 'master'
Expand filtered parameters to include `token`
See merge request !14174
| -rw-r--r-- | config/application.rb | 4 |
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 |