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

Merge branch 'rs-filter-params' into 'security'
ada8b026 · Rémy Coutable · Alejandro Rodríguez · 4bf61b8b · ada8b026
Commit ada8b026 authored Dec 09, 2016 by Rémy Coutable Committed by Alejandro Rodríguez Dec 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

application.rb config/application.rb +3 -1

No files found.
--- 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