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 /spec/lib | |
| 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 'spec/lib')
0 files changed, 0 insertions, 0 deletions