summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorImre Farkas <ifarkas@gitlab.com>2018-05-30 12:12:42 +0200
committerImre Farkas <ifarkas@gitlab.com>2018-06-06 22:25:20 +0200
commit854c9636ec6aabd8941b31f0f2aa4e89c9c072ce (patch)
treec618473ce420ca8abe707ea1c821a6a94bfc16f5 /config
parentd8eea0c4ba74a3bc821e1298e85f3fed77273099 (diff)
downloadgitlab-ce-854c9636ec6aabd8941b31f0f2aa4e89c9c072ce.tar.gz
Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter and filter out file content from logs
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 1b575f1325d..d379d611074 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -70,6 +70,7 @@ module Gitlab
# - Webhook URLs (:hook)
# - Sentry DSN (:sentry_dsn)
# - Deploy keys (:key)
+ # - File content from Web Editor (:content)
config.filter_parameters += [/token$/, /password/, /secret/]
config.filter_parameters += %i(
certificate
@@ -81,6 +82,7 @@ module Gitlab
sentry_dsn
trace
variables
+ content
)
# Enable escaping HTML in JSON.