diff options
author | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:40:46 -0600 |
---|---|---|
committer | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:40:46 -0600 |
commit | b423ac926497367b418c31f65fec69bb3a193170 (patch) | |
tree | 1ba44da45b7f15cc8dbd888b0ed7e92373ec5a54 /app/controllers/api/base_controller.rb | |
parent | 34b02a74b4a68f62e2a7c0cbee06edfe2aa92edd (diff) | |
parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/controllers/api/base_controller.rb')
-rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 818819a3f..399d11766 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -103,7 +103,7 @@ class Api::BaseController < ApplicationController elsif !current_user.functional? render json: { error: 'Your login is currently disabled' }, status: 403 else - set_user_activity + update_user_sign_in end end |