Commit 5ae91f32 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'revert-238781a6' into 'master'

Revert "Merge branch 'sh-filter-secret-variables' into 'master'"

See merge request gitlab-org/gitlab-ce!17733
parents ea01d475 38f014b8
...@@ -70,7 +70,6 @@ module Gitlab ...@@ -70,7 +70,6 @@ module Gitlab
# - Webhook URLs (:hook) # - Webhook URLs (:hook)
# - Sentry DSN (:sentry_dsn) # - Sentry DSN (:sentry_dsn)
# - Deploy keys (:key) # - Deploy keys (:key)
# - Secret variable values (:value)
config.filter_parameters += [/token$/, /password/, /secret/] config.filter_parameters += [/token$/, /password/, /secret/]
config.filter_parameters += %i( config.filter_parameters += %i(
certificate certificate
...@@ -82,7 +81,6 @@ module Gitlab ...@@ -82,7 +81,6 @@ module Gitlab
sentry_dsn sentry_dsn
trace trace
variables variables
value
) )
# Enable escaping HTML in JSON. # Enable escaping HTML in JSON.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment