Commit 2c3fe16f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'filter-private-token-param' into 'master'

Filter private_token and password_confirmation params from logs.

Closes #1770.

```
Started GET "/profile?private_token=[FILTERED]" for 127.0.0.1 at 2015-02-06 22:54:03 +0100
Processing by ProfilesController#show as HTML
  Parameters: {"private_token"=>"[FILTERED]"}
```

See merge request !1483
parents 5bf33f97 8d1fa44f
......@@ -31,7 +31,7 @@ module Gitlab
config.encoding = "utf-8"
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters.push(*[:password])
config.filter_parameters.push(:password, :password_confirmation, :private_token)
# Enable escaping HTML in JSON.
config.active_support.escape_html_entities_in_json = true
......
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