]> cat aescling's git repositories - mastodon.git/commit
Fix 2FA challenge and password challenge for non-database users (#11831)
authorEugen Rochko <eugen@zeonfederated.com>
Sun, 15 Sep 2019 19:08:39 +0000 (21:08 +0200)
committerGitHub <noreply@github.com>
Sun, 15 Sep 2019 19:08:39 +0000 (21:08 +0200)
commitc707ef49d9b13932f4d98c127ec3148a5cdc3479
tree6d282c8b2ee513f2d3f29753bf6c6c0d2c3a227c
parent1511638975de077b6b8d5397a830239bb317a016
Fix 2FA challenge and password challenge for non-database users (#11831)

* Fix 2FA challenge not appearing for non-database users

Fix #11685

* Fix account deletion not working when using external login

Fix #11691
app/controllers/auth/sessions_controller.rb
app/controllers/settings/deletes_controller.rb
app/models/form/delete_confirmation.rb
app/views/settings/deletes/show.html.haml
config/initializers/devise.rb
config/locales/en.yml
spec/controllers/auth/sessions_controller_spec.rb