From 2ddc13577c93505b887880fa715def9addeafafe Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Tue, 11 Jun 2019 00:25:07 +0100
Subject: Don't warn user about password reset disabling through config code
 (#5387)

Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen?

Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense.

Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled.
---
 changelog.d/5387.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5387.bugfix

(limited to 'changelog.d/5387.bugfix')

diff --git a/changelog.d/5387.bugfix b/changelog.d/5387.bugfix
new file mode 100644
index 0000000000..2c6c94efc4
--- /dev/null
+++ b/changelog.d/5387.bugfix
@@ -0,0 +1 @@
+Warn about disabling email-based password resets when a reset occurs, and remove warning when someone attempts a phone-based reset.
-- 
cgit 1.4.1