logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 956da43e19e484f94df91f715e4a88794a25dbec
parent: cea9fb31fefbe3723669082650f32956fabd5123
Author: Eugen <eugen@zeonfederated.com>
Date:   Sun, 22 Jan 2017 23:07:31 +0100

Fix error

Diffstat:

Mconfig/initializers/trusted_proxies.rb6+++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb @@ -1,7 +1,11 @@ module Rack class Request def trusted_proxy?(ip) - Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip } + if Rails.application.config.action_dispatch.trusted_proxies.nil? + super + else + Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip } + end end end end