diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
| commit | d72452a5965c0df32a13053ae86bcd529fc0fc9e (patch) | |
| tree | fb03041e6cf5d8b56d308481492821af8e663028 /app/models | |
| parent | 50371ba04b52f74bfc2ceb05a429e072ad4848bb (diff) | |
| parent | f5d36fc67d1994b7cc1ce02e7be2767ffcb47857 (diff) | |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
db/migrate/20140306024707_create_servers.rb
db/migrate/20140306024711_create_matches.rb
db/migrate/20140306024713_create_teams.rb
db/migrate/20140306024715_create_alerts.rb
db/migrate/20140306024718_create_pms.rb
db/migrate/20140306024722_create_users.rb
db/migrate/20140306024724_create_sessions.rb
db/migrate/20140306024729_create_server_settings.rb
db/migrate/20140306024731_create_user_team_pairs.rb
db/migrate/20140306024733_create_team_match_pairs.rb
db/migrate/20140306024735_create_tournament_options.rb
db/migrate/20140306024744_add_hidden_attrs_to_user.rb
db/migrate/20140306202154_create_servers.rb
db/migrate/20140306202156_create_tournaments.rb
db/migrate/20140306202158_create_matches.rb
db/migrate/20140306202200_create_teams.rb
db/migrate/20140306202202_create_alerts.rb
db/migrate/20140306202204_create_pms.rb
db/migrate/20140306202207_create_games.rb
db/migrate/20140306202209_create_users.rb
db/migrate/20140306202211_create_sessions.rb
db/migrate/20140306202213_create_game_attributes.rb
db/migrate/20140306202215_create_server_settings.rb
db/migrate/20140306202217_create_tournament_options.rb
db/migrate/20140306202219_create_user_team_pairs.rb
db/migrate/20140306202224_create_team_match_pairs.rb
db/migrate/20140306202232_add_hidden_attrs_to_user.rb
db/migrate/20140306222309_create_servers.rb
db/migrate/20140306222320_create_matches.rb
db/migrate/20140306222325_create_teams.rb
db/migrate/20140306222330_create_alerts.rb
db/migrate/20140306222336_create_pms.rb
db/migrate/20140306222347_create_users.rb
db/migrate/20140306222352_create_sessions.rb
db/migrate/20140306222357_create_server_settings.rb
db/migrate/20140306222402_create_tournament_options.rb
db/migrate/20140306222422_create_user_team_pairs.rb
db/migrate/20140306222427_create_team_match_pairs.rb
db/migrate/20140306222447_add_hidden_attrs_to_user.rb
db/schema.rb
generate.sh
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 |