Commit 400086b3 authored by Rémy Coutable's avatar Rémy Coutable Committed by Rémy Coutable

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: default avatarRémy Coutable <remy@rymai.me>
parent 27902604
...@@ -45,7 +45,7 @@ module Gitlab ...@@ -45,7 +45,7 @@ module Gitlab
# #
# Parameters filtered: # Parameters filtered:
# - Password (:password, :password_confirmation) # - Password (:password, :password_confirmation)
# - Private tokens (:private_token) # - Private tokens
# - Two-factor tokens (:otp_attempt) # - Two-factor tokens (:otp_attempt)
# - Repo/Project Import URLs (:import_url) # - Repo/Project Import URLs (:import_url)
# - Build variables (:variables) # - Build variables (:variables)
...@@ -59,11 +59,13 @@ module Gitlab ...@@ -59,11 +59,13 @@ module Gitlab
encrypted_key encrypted_key
hook hook
import_url import_url
incoming_email_token
key key
otp_attempt otp_attempt
password password
password_confirmation password_confirmation
private_token private_token
runners_token
secret_token secret_token
sentry_dsn sentry_dsn
variables variables
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment