tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.
This commit is contained in:
Claire
2022-01-16 18:11:20 +01:00
parent 07cb948f39 462bc65112
commit b61c3ddff8
24 changed files with 151 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/auth/sessions_controller.rb
View File

@ -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)