diff options
author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-07 17:29:20 -0500 |
---|---|---|
committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-07 17:29:20 -0500 |
commit | 7e7a0a4a0465142612acd1e0d050cb1b91f93d90 (patch) | |
tree | 164c4ca2e0b54e9b6665cb981f7e46a2ac159999 /app/models/user.rb | |
parent | 7243bc441795b70249d99bd43a4a0a88c042f91f (diff) | |
parent | 5f7189c2fe6f39b2056d5f3a6d91e557306697da (diff) |
no conflicts:
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 6e439fb..70e7f25 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -19,7 +19,7 @@ class User < ActiveRecord::Base when :admin return ((groups & 2) != 0) when :host - return true #((groups & 1) != 0) + return ((groups & 1) != 0) when :player return true when :specator |