]> cat aescling's git repositories - mastodon.git/commitdiff
Fix error
authorEugen <eugen@zeonfederated.com>
Sun, 22 Jan 2017 22:07:31 +0000 (23:07 +0100)
committerGitHub <noreply@github.com>
Sun, 22 Jan 2017 22:07:31 +0000 (23:07 +0100)
config/initializers/trusted_proxies.rb

index 27e9ee03961005ec9b7e7b83ec6e6c0d254f211d..3c2afd8cdb0048bf39ae0b0f523b0fd962e252fa 100644 (file)
@@ -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