Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Pass trusted_proxies to action_dispatch as IPAddrs instead of strings
9ab70184 · DJ Mountney · 973b948b · 9ab70184
Commit 9ab70184 authored Apr 28, 2016 by DJ Mountney
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

trusted_proxies.rb config/initializers/trusted_proxies.rb +2 -1

No files found.
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
-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) }