Fix bug preventing the inactive-user user to reset their password (lo…

…bsters#725) Fix lobsters#721 The validation *validates_each :username* caused actions touching inactive-user like password resets to throw 500s and db:seed to fail.
4io · Aug 21, 2019 · 791b21f · 791b21f
1 parent be1bec2
commit 791b21f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
@@ -116,7 +116,7 @@ def reset_password
     end
 
     if @found_user.is_wiped?
-      flash.now[:error] = "It's not possible to reest your password " <<
+      flash.now[:error] = "It's not possible to reset your password " <<
                           "because your account was deleted before the site changed admins " <<
                           "and your email address was wiped for privacy."
       return forgot_password

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -110,7 +110,7 @@ class User < ApplicationRecord
   end
 
   BANNED_USERNAMES = ["admin", "administrator", "contact", "fraud", "guest",
-    "help", "hostmaster", "inactive-user", "lobster", "lobsters", "mailer-daemon", "moderator",
+    "help", "hostmaster", "lobster", "lobsters", "mailer-daemon", "moderator",
     "moderators", "nobody", "postmaster", "root", "security", "support",
     "sysop", "webmaster", "enable", "new", "signup",].freeze