diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-13 09:53:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-13 09:53:13 +0000 |
| commit | e83424a13e1b5d2e55ae5bd0aeae6a4c5f88262a (patch) | |
| tree | fbd59aea542ed6661f5261a49a862b07132f7b00 /CHANGELOG | |
| parent | 5d14615a762d63ba3e04fa5ebbbbd990bdbd7572 (diff) | |
| parent | e18f20d7118b7c8f2ff18a6e4255d6c7c0995b04 (diff) | |
| download | gitlab-ce-e83424a13e1b5d2e55ae5bd0aeae6a4c5f88262a.tar.gz | |
Merge branch 'configure_trusted_proxies' into 'master'
Adjust the default trusted_proxies to only include localhost
And also allow other trusted proxies to be added from the config.yml.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538
Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208
See merge request !3524
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9b0c6ba4609..2b2d26c2540 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,8 @@ v 8.7.0 (unreleased) - Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea) - All images in discussions and wikis now link to their source files !3464 (Connor Shea). - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu) + - Add setting for customizing the list of trusted proxies !3524 + - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524 - Improved Markdown rendering performance !3389 (Yorick Peterse) - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan Hu) - Expose project badges in project settings |