diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-07 09:26:24 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-07 09:26:24 +0000 |
| commit | bc5fd64142f0d9640b68989e1327b8a6bb10c8c8 (patch) | |
| tree | 06206b8a98999b589beb81cbac37ceaeaadf48af /config | |
| parent | a9155ab05eb68fdf5d6967d268d8be8de7af6ab8 (diff) | |
| parent | 854c9636ec6aabd8941b31f0f2aa4e89c9c072ce (diff) | |
| download | gitlab-ce-bc5fd64142f0d9640b68989e1327b8a6bb10c8c8.tar.gz | |
Merge branch '45505-lograge_formatter_encoding' into 'master'
Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter
Closes #45505
See merge request gitlab-org/gitlab-ce!19244
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 |
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. |