diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-13 22:03:25 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-13 22:03:25 +0000 |
| commit | 5ae91f323d054341c0d012de85835ef40f1bf9f8 (patch) | |
| tree | c37f426176cecf8bea6eafe9747c1d833b0f5a03 | |
| parent | ea01d4752f041afead7677872ba076682a6620db (diff) | |
| parent | 38f014b82bb8c19b4ea9f499900e212f44534d88 (diff) | |
| download | gitlab-ce-5ae91f323d054341c0d012de85835ef40f1bf9f8.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 422b16a7719..0ff95e33a9c 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. |