Merge remote-tracking branch 'origin/master'

CHANGELOG.rst

@@ -30,6 +30,7 @@ Fixed
   allowed access if no scopes were allowed.
 * The site logo could overlap with the menu for logos with an unexpected aspect ratio.
 * Some OAuth2 views stopped working with long scope names.
+* Resetting password was impossible due to a missing rule
 
 Changed
 ~~~~~~~

aleksis/core/rules.py

@@ -326,6 +326,9 @@ rules.add_perm("core.can_register", can_register_predicate)
 can_change_password_predicate = is_site_preference_set(section="auth", pref="allow_password_change")
 rules.add_perm("core.can_change_password", can_change_password_predicate)
 
+can_reset_password_predicate = is_site_preference_set(section="auth", pref="allow_password_reset")
+rules.add_perm("core.can_reset_password", can_reset_password_predicate)
+
 # django-invitations
 invite_enabled_predicate = is_site_preference_set(section="auth", pref="invite_enabled")
 rules.add_perm("core.invite_enabled", invite_enabled_predicate)