diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-06 23:48:54 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-06 23:48:54 -0400 |
| commit | 15eaa246ae30cc0050fd59a0864b445229464c31 (patch) | |
| tree | 3b11caffa5e4fcb704ecc7d2c73719077cc9f5af /app/models | |
| parent | 4ac5229d216bd6d18a2b6e39bf90f76cbdfbb7c3 (diff) | |
| parent | 3602d46e95f9a13ec2a8ff0b0909059af64c55ba (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/match.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/match.rb b/app/models/match.rb index c596ced..48d6b83 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -1,6 +1,6 @@ class Match < ActiveRecord::Base belongs_to :tournament - + has_many :scores has_and_belongs_to_many :teams belongs_to :winner, class_name: "Team" diff --git a/app/models/user.rb b/app/models/user.rb index 0b77ab1..0446b35 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,6 +3,7 @@ class User < ActiveRecord::Base has_and_belongs_to_many :tournaments_hosted, class_name: "Tournament", foreign_key: "host_id", join_table: "hosts_tournaments" has_and_belongs_to_many :teams has_many :sessions + has_many :scores apply_simple_captcha |