From 3805253fd681b5a4f72bc65b599e058d4c524152 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Tue, 24 Sep 2019 14:25:57 +0800
Subject: [PATCH] fix merge

---
 app/models/user.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index b9d9e48e6..e55bb8425 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -26,6 +26,8 @@ class User < ApplicationRecord
 
   MIX_PASSWORD_LIMIT = 8
 
+  LOGIN_CHARS = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z).freeze
+
   has_one :user_extension, dependent: :destroy
   accepts_nested_attributes_for :user_extension, update_only: true