diff options
| author | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
|---|---|---|
| committer | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
| commit | ddafde942ca53816c19b0ea0cb40bb1b46cf5668 (patch) | |
| tree | c0ac2138fe994c4c2a15c23b47d4155f75148945 /app/models/user.rb | |
| parent | e6300de1421d28d173658e61601b9e016c3d0a6d (diff) | |
| parent | da42bfadb58888e3a18afd66395f0f3edc2fa622 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index fccf1089b..c31a0c644 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -91,8 +91,10 @@ class User < ApplicationRecord settings.auto_play_gif end - def activate_session - session_activations.activate(SecureRandom.hex).session_id + def activate_session(request) + session_activations.activate(session_id: SecureRandom.hex, + user_agent: request.user_agent, + ip: request.ip).session_id end def exclusive_session(id) |