diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
| commit | a1700f50ee800cfbfb93bd7dfff7b5d79ae2cb2f (patch) | |
| tree | c9db0b8bdd4818f5ce2ff982657e2aedfda98f8f /app/models/user.rb | |
| parent | 706392b7c4520382ddd8f827b31205c6b71f5320 (diff) | |
| parent | 63830b0f939db5f6911218950525428420c4d467 (diff) | |
Merge branch 'master2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
config/routes.rb
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 976ecf4..6405c8e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -17,7 +17,7 @@ class User < ActiveRecord::Base when :admin return ((groups & 2) != 0) when :host - return ((groups & 1) != 0) + return true #((groups & 1) != 0) when :player return true when :specator |