diff options
| author | DJ Mountney <david@twkie.net> | 2016-04-28 12:05:45 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2016-04-28 12:05:45 -0700 |
| commit | 9ab70184e3299766165017267a74f53e80b03836 (patch) | |
| tree | 1a1352e5f5c1b37bdd24dc43a6eabbe5a1192ac0 | |
| parent | 973b948b9e9553a57113983fa4e32207b581e0ad (diff) | |
| download | gitlab-ce-9ab70184e3299766165017267a74f53e80b03836.tar.gz | |
Pass trusted_proxies to action_dispatch as IPAddrs instead of strings
Without this setting your own trusted_proxies does not work.
| -rw-r--r-- | config/initializers/trusted_proxies.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb index b8cc025bae2..d256a16d42b 100644 --- a/config/initializers/trusted_proxies.rb +++ b/config/initializers/trusted_proxies.rb @@ -1,2 +1,3 @@ -Rails.application.config.action_dispatch.trusted_proxies = +Rails.application.config.action_dispatch.trusted_proxies = ( [ '127.0.0.1', '::1' ] + Array(Gitlab.config.gitlab.trusted_proxies) +).map { |proxy| IPAddr.new(proxy) } |