diff options
| author | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-11-19 10:02:56 -0600 |
| commit | 383bb3804bdbd6caa442283cc96ef0cdbfdb4575 (patch) | |
| tree | 54ecc09c325567ab1cfc4af9ba13ad134d9c3c72 /app/controllers/api/base_controller.rb | |
| parent | 259470ec37dfc5c3d34ed5456adcd3ab1a622a18 (diff) | |
| parent | db01f8b942b72eaa2eacbb144261b002f8079c9c (diff) | |
Merge branch 'glitch' into main
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 e962c4e97..fe199e689 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 |