diff options
author | Robert Speicher <robert@gitlab.com> | 2018-01-11 16:21:34 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-01-11 16:21:34 +0000 |
commit | ca8394e8e4931c85b5f2a2bde1951bcb9419e220 (patch) | |
tree | 9befffddce66e6e768a40e19c5afd03245702e92 | |
parent | 7de93f2433f4a533a51f5dbce1b2e0a432d0012c (diff) | |
parent | 403fbe227dbcf42f9c21a758ce57ee7f09bfc8b1 (diff) | |
download | gitlab-ce-ca8394e8e4931c85b5f2a2bde1951bcb9419e220.tar.gz |
Merge branch 'sh-filter-build-trace-params' into 'master'
Filter out build traces from logged parameters
Closes #41906
See merge request gitlab-org/gitlab-ce!16375
-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 1110199b888..cd5e3d45bab 100644 --- a/config/application.rb +++ b/config/application.rb @@ -61,6 +61,7 @@ module Gitlab # - Any parameter containing `secret` # - Two-factor tokens (:otp_attempt) # - Repo/Project Import URLs (:import_url) + # - Build traces (:trace) # - Build variables (:variables) # - GitLab Pages SSL cert/key info (:certificate, :encrypted_key) # - Webhook URLs (:hook) @@ -75,6 +76,7 @@ module Gitlab key otp_attempt sentry_dsn + trace variables ) |