Merge pull request #1698 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

config/initializers/rack_attack.rb

@@ -83,11 +83,10 @@ class Rack::Attack
 
   throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|
     if req.post? && req.path == '/auth'
-      if req.remote_ip.ipv6?
+      addr = req.remote_ip
-        req.remote_ip.mask(64)
+      addr = IPAddr.new(addr) if addr.is_a?(String)
-      else
+      addr = addr.mask(64) if addr.ipv6?
-        req.remote_ip
+      addr.to_s
-      end
     end
   end