diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-14 00:50:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 00:50:43 +0100 |
| commit | db01f8b942b72eaa2eacbb144261b002f8079c9c (patch) | |
| tree | 2391ed3e8c3cb95c50d7e5fe3d35b36148989cb7 /app/controllers/api | |
| parent | 8ffae82fa61385a33f819e037aa741d0b3e99187 (diff) | |
| parent | de5cc20dd8e15eb7e90d65392a6e6f9145746913 (diff) | |
Merge pull request #1465 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -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 |