diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 22:39:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-16 22:39:35 +0100 |
| commit | a85912b0d6d2ee68aa35794fbb51c5358768c092 (patch) | |
| tree | af0dde21359576102ab8dcf8a1dc3342f67bb71c /app/controllers/auth | |
| parent | 07cb948f39464b11959fc506b673a90d9524e519 (diff) | |
| parent | 278bd61d6f507e56350e7f14caaeaa954700ecd8 (diff) | |
Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth')
| -rw-r--r-- | app/controllers/auth/sessions_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 2636b4718..ddc87adff 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -153,7 +153,7 @@ class Auth::SessionsController < Devise::SessionsController clear_attempt_from_session - user.update_sign_in!(request, new_sign_in: true) + user.update_sign_in!(new_sign_in: true) sign_in(user) flash.delete(:notice) |