diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 18:11:20 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 18:11:20 +0100 |
| commit | b61c3ddff8338432fdc287f6bebbf76a12859c17 (patch) | |
| tree | 702e67a92f3a6e84feed3c06126b14a7e4ecab35 /app/controllers/auth | |
| parent | 07cb948f39464b11959fc506b673a90d9524e519 (diff) | |
| parent | 462bc65112276f4cbfbeb1efd8cd452fda7d0f23 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.
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) |