diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-07 16:21:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 16:21:42 +0200 |
| commit | c4e1b82caf5c932a3c19bc77726c9e3ab3d2c46a (patch) | |
| tree | 432bd5bc0c7ec19aac3175150e397b5336c71a4d /app/controllers/auth/passwords_controller.rb | |
| parent | 94e09d309cb068ea92919767e40e655260ac43cb (diff) | |
| parent | 6c7ac1b48f7d4c6d0a1e0cf7f663c3188421d7c7 (diff) | |
Merge pull request #1373 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth/passwords_controller.rb')
| -rw-r--r-- | app/controllers/auth/passwords_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb index c224e1a03..42534f8ce 100644 --- a/app/controllers/auth/passwords_controller.rb +++ b/app/controllers/auth/passwords_controller.rb @@ -9,7 +9,10 @@ class Auth::PasswordsController < Devise::PasswordsController def update super do |resource| - resource.session_activations.destroy_all if resource.errors.empty? + if resource.errors.empty? + resource.session_activations.destroy_all + resource.forget_me! + end end end |