diff options
| author | Rémy Coutable <remy@gitlab.com> | 2016-12-09 16:31:14 +0000 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2016-12-14 11:25:40 -0300 |
| commit | fbfd9815854148cd4be5a17f8cc16894d7395b75 (patch) | |
| tree | 0a871a60e43004488bb3b6e23d2a0ea699d4ecef /config | |
| parent | d5ec0786c2043f9bf54eeaa33fd2fe97b4585fff (diff) | |
| download | gitlab-ce-fbfd9815854148cd4be5a17f8cc16894d7395b75.tar.gz | |
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')
| -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 0aa2873f94a..110acdc78b3 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 |