diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-13 22:03:25 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-03-13 18:28:24 -0500 |
| commit | 26f173afb0efc21cc16d8150258016555fd1bbe0 (patch) | |
| tree | bac419cb176e0b20818ed401bb3cd03099c0cdb6 | |
| parent | 286d4d709b0923c8b9a78105388576901e9a20a6 (diff) | |
| download | gitlab-ce-26f173afb0efc21cc16d8150258016555fd1bbe0.tar.gz | |
Merge branch 'revert-238781a6' into 'master'
Revert "Merge branch 'sh-filter-secret-variables' into 'master'"
See merge request gitlab-org/gitlab-ce!17733
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 74fe3e439ed..c32711705fe 100644 --- a/config/application.rb +++ b/config/application.rb @@ -70,7 +70,6 @@ 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 @@ -82,7 +81,6 @@ module Gitlab sentry_dsn trace variables - value ) # Enable escaping HTML in JSON. |