Merge branch 'ce-to-ee-2018-03-14' into 'master'

CE upstream - 2018-03-14 03:53 UTC

See merge request gitlab-org/gitlab-ee!4962

config/application.rb

@@ -84,7 +84,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
@@ -96,7 +95,6 @@ module Gitlab
       sentry_dsn
       trace
       variables
-      value
     )
 
     # Enable escaping HTML in JSON.