Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
authorfeld <feld@feld.me>
Wed, 2 Sep 2020 17:11:24 +0000 (17:11 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 8 Sep 2020 10:53:47 +0000 (13:53 +0300)
commit43b07c31cb88fbb87ff41a8e24303f930a657f44
tree6d2d127b90b75a187893bdadfdb2e7a043b21606
parent515116e2f02c38763f551308a33f93ccd54f8186
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'

Disallow password resets for deactivated accounts

Closes #2095

See merge request pleroma/pleroma!2935
CHANGELOG.md
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex
test/web/mastodon_api/controllers/auth_controller_test.exs