diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/tournament.rb | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 67f994d..10d7b30 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -61,7 +61,6 @@ class Tournament < ActiveRecord::Base end end - def keys @tournament.preferences_raw.all.collect { |x| x.name } end 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 |