diff options
| author | Rémy Coutable <remy@gitlab.com> | 2016-12-09 19:31:14 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-14 17:18:12 +0300 |
| commit | 400086b332320f1701bf7ce6943a0ba951c291b7 (patch) | |
| tree | 8d48f4c13c12b193a5ca453436589b9f9f6d30ba | |
| parent | 2790260427b1b4ae2d890f422cffda3c7ba7714b (diff) | |
Merge branch 'rs-filter-params' into 'security'
Filter `incoming_email_token` and `runners_token` parameters
Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2676
See merge request !2045
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 92c8467e7f4..8104929f9b2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -45,7 +45,7 @@ module Gitlab # # Parameters filtered: # - Password (:password, :password_confirmation) - # - Private tokens (:private_token) + # - Private tokens # - Two-factor tokens (:otp_attempt) # - Repo/Project Import URLs (:import_url) # - Build variables (:variables) @@ -59,11 +59,13 @@ module Gitlab encrypted_key hook import_url + incoming_email_token key otp_attempt password password_confirmation private_token + runners_token secret_token sentry_dsn variables |