Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
This commit is contained in:
@ -11,6 +11,8 @@ class Auth::PasswordsController < Devise::PasswordsController
|
||||
super do |resource|
|
||||
if resource.errors.empty?
|
||||
resource.session_activations.destroy_all
|
||||
|
||||
resource.revoke_access!
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user