diff options
| author | Rémy Coutable <remy@gitlab.com> | 2016-12-09 19:31:14 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-12-15 17:42:44 +0300 |
| commit | ada8b026ef55733a94821525249ed67a094d5521 (patch) | |
| tree | 89bfafc1ad6564d4fac64d7c9929ae00208ce5b2 /config/application.rb | |
| parent | 4bf61b8bd4b04eace6d0f205573f15fc9d981682 (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
Diffstat (limited to 'config/application.rb')
| -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 fbf50df2850..782a7a36895 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, :authentication_token) + # - Private tokens # - Two-factor tokens (:otp_attempt) # - Repo/Project Import URLs (:import_url) # - Build variables (:variables) @@ -60,11 +60,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 |