]> cat aescling's git repositories - mastodon.git/commitdiff
Use request.remote_ip instead of request.ip (#4744)
authornullkal <nullkal@nil.nu>
Wed, 30 Aug 2017 08:24:30 +0000 (17:24 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 30 Aug 2017 08:24:30 +0000 (10:24 +0200)
app/models/user.rb

index 02b1b26ee2b59344d8901d589c04a36d50c80478..5e548c1efb0d6852eb69c183c5d4bc4642e5a3e3 100644 (file)
@@ -124,7 +124,7 @@ class User < ApplicationRecord
   def activate_session(request)
     session_activations.activate(session_id: SecureRandom.hex,
                                  user_agent: request.user_agent,
-                                 ip: request.ip).session_id
+                                 ip: request.remote_ip).session_id
   end
 
   def exclusive_session(id)