about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authornullkal <nullkal@nil.nu>2017-08-30 17:24:30 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-08-30 10:24:30 +0200
commit39e7a763ff242faf3bfe9a666ac7b6f455c0c080 (patch)
tree94b723cb4abbc8b913192fd0918429b6033466a3 /app/models
parente95bdec7c5da63930fc2e08e67e4358fec19296d (diff)
Use request.remote_ip instead of request.ip (#4744)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
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)