diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-14 21:33:36 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-14 21:33:36 +0300 |
| commit | 12058fbeb8b62b81ef40c477fe9ed1df151bbe5c (patch) | |
| tree | a9a2f84ec3e3e2f2775ec709b4cc72d38f75872f /config | |
| parent | 62c6b062e2abe1412191355f4278dcab43f99580 (diff) | |
| parent | e2cc500e4e6b27bd158a84cf7d38768fd28fa642 (diff) | |
Merge branch 'filter-note-parameters' into 'master'
Include additional fields in the Rails filter_parameters configuration
See merge request gitlab-org/gitlab-ce!25238
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 92a3d031c63..49e7f5836e4 100644 --- a/config/application.rb +++ b/config/application.rb @@ -97,7 +97,7 @@ module Gitlab # # NOTE: It is **IMPORTANT** to also update gitlab-workhorse's filter when adding parameters here to not # introduce another security vulnerability: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/182 - config.filter_parameters += [/token$/, /password/, /secret/, /key$/] + config.filter_parameters += [/token$/, /password/, /secret/, /key$/, /^note$/, /^text$/] config.filter_parameters += %i( certificate encrypted_key |