diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-09 09:47:16 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-09 09:47:16 +0000 |
| commit | 7d95d3cde79683fda221e3108d80e7d1fe86e81a (patch) | |
| tree | 8adc4f20a3eb449c7114b6a0bd28c23f974adb97 /lib/api | |
| parent | 4bc4f06512620271a8d454b966e7f5c288a68829 (diff) | |
| parent | e37b31456774c92fd718f7ef0a576266ffcca894 (diff) | |
| download | gitlab-ce-7d95d3cde79683fda221e3108d80e7d1fe86e81a.tar.gz | |
Merge branch 'trusted-proxies-ip-addr' into 'master'
Pass trusted_proxies to action_dispatch as IPAddrs instead of strings
Without this setting your own trusted_proxies does not work.
Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17004
See merge request !3970
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions