diff options
author | tkimia <tkimia@purdue.edu> | 2014-04-07 01:07:17 -0400 |
---|---|---|
committer | tkimia <tkimia@purdue.edu> | 2014-04-07 01:07:17 -0400 |
commit | 0bb3311d90d74e80e6624897a56ab4e5641a2c76 (patch) | |
tree | 2fd70a27d67ed60cad43196c9f04c91e1056139a /app/models/user.rb | |
parent | c524bba025ffd09044ce35efc85ee720f3179111 (diff) | |
parent | 315f3f87a060bc6c47a98a54c397ddb25e84bfc5 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 0446b35..3407355 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -111,7 +111,7 @@ class User < ActiveRecord::Base # VALID_USER_NAME checks to make sure a user's user_name # is in the proper format. - VALID_USER_NAME_REG = /\A[a-zA-Z0-9\-]+\z/ + VALID_USER_NAME_REG = /\A[a-zA-Z0-9 _\-]+\z/ # The following lines put a user account through a series of # validations in order to make sure all of their information |