diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:47:20 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:47:20 -0500 |
| commit | 706392b7c4520382ddd8f827b31205c6b71f5320 (patch) | |
| tree | 55444920bb49c5cc104e919737ebcda44eb45321 /app/models | |
| parent | eebd00ba4692a6a285c9807705331ab924ce225f (diff) | |
| parent | d72452a5965c0df32a13053ae86bcd529fc0fc9e (diff) | |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/teams/show.html.erb
app/views/tournaments/index.html.erb
config/routes.rb
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/game_attribute.rb | 3 | ||||
| -rw-r--r-- | app/models/game_option.rb | 2 | ||||
| -rw-r--r-- | app/models/score.rb | 4 | ||||
| -rw-r--r-- | app/models/team.rb | 1 | ||||
| -rw-r--r-- | app/models/tournament_option.rb | 1 | ||||
| -rw-r--r-- | app/models/tournament_user_pair.rb | 4 |
6 files changed, 12 insertions, 3 deletions
diff --git a/app/models/game_attribute.rb b/app/models/game_attribute.rb deleted file mode 100644 index c12723b..0000000 --- a/app/models/game_attribute.rb +++ /dev/null @@ -1,3 +0,0 @@ -class GameAttribute < ActiveRecord::Base - belongs_to :game -end diff --git a/app/models/game_option.rb b/app/models/game_option.rb new file mode 100644 index 0000000..bdc5560 --- /dev/null +++ b/app/models/game_option.rb @@ -0,0 +1,2 @@ +class GameOption < ActiveRecord::Base +end diff --git a/app/models/score.rb b/app/models/score.rb new file mode 100644 index 0000000..a9b9c71 --- /dev/null +++ b/app/models/score.rb @@ -0,0 +1,4 @@ +class Score < ActiveRecord::Base + belongs_to :user + belongs_to :match +end diff --git a/app/models/team.rb b/app/models/team.rb index fa7ba9e..9e71557 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -1,2 +1,3 @@ class Team < ActiveRecord::Base + belongs_to :match end diff --git a/app/models/tournament_option.rb b/app/models/tournament_option.rb index 950b351..242a6f6 100644 --- a/app/models/tournament_option.rb +++ b/app/models/tournament_option.rb @@ -1,2 +1,3 @@ class TournamentOption < ActiveRecord::Base + belongs_to :tournament end diff --git a/app/models/tournament_user_pair.rb b/app/models/tournament_user_pair.rb new file mode 100644 index 0000000..eb4e9c5 --- /dev/null +++ b/app/models/tournament_user_pair.rb @@ -0,0 +1,4 @@ +class TournamentUserPair < ActiveRecord::Base + belongs_to :tournament + belongs_to :user +end |