From: nullkal <nullkal@nil.nu>
Date: Wed, 30 Aug 2017 08:24:30 +0000 (+0900)
Subject: Use request.remote_ip instead of request.ip (#4744)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=39e7a763ff242faf3bfe9a666ac7b6f455c0c080;p=mastodon.git

Use request.remote_ip instead of request.ip (#4744)
---

diff --git a/app/models/user.rb b/app/models/user.rb
index 02b1b26ee..5e548c1ef 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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)