diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
commit | 1ecd3d50d0ac73968362f885c9f60ec38253be9a (patch) | |
tree | 324f79ad4d4da1af623fc93f215643287d6210f3 /db | |
parent | b2e0b1397596ee8f624ef4de122cc71599d4dc0d (diff) | |
parent | c1f714a479eb7ca9e9125e283361a471dd928278 (diff) |
Merge branch 'clean'
Conflicts:
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20140307052327_create_servers.rb (renamed from db/migrate/20140307045916_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052331_create_matches.rb (renamed from db/migrate/20140307045922_create_matches.rb) | 1 | ||||
-rw-r--r-- | db/migrate/20140307052334_create_teams.rb (renamed from db/migrate/20140307045927_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052338_create_alerts.rb (renamed from db/migrate/20140307045934_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052342_create_pms.rb (renamed from db/migrate/20140307045941_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052346_create_tournaments.rb (renamed from db/migrate/20140307045948_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052350_create_games.rb (renamed from db/migrate/20140307045954_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052354_create_users.rb (renamed from db/migrate/20140307050001_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052358_create_sessions.rb (renamed from db/migrate/20140307050008_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052402_create_server_settings.rb (renamed from db/migrate/20140307050016_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052405_create_tournament_options.rb (renamed from db/migrate/20140307050023_create_tournament_options.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052409_create_game_options.rb (renamed from db/migrate/20140307050029_create_game_options.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052413_create_scores.rb (renamed from db/migrate/20140307050035_create_scores.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052417_create_tournament_players_join_table.rb (renamed from db/migrate/20140307050041_create_tournament_players_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052421_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140307050046_create_tournament_hosts_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052424_create_team_user_join_table.rb (renamed from db/migrate/20140307050052_create_team_user_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052428_create_match_team_join_table.rb (renamed from db/migrate/20140307050059_create_match_team_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307052443_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140307050124_add_hidden_attrs_to_user.rb) | 0 | ||||
-rw-r--r-- | db/schema.rb | 4 |
19 files changed, 4 insertions, 1 deletions
diff --git a/db/migrate/20140307045916_create_servers.rb b/db/migrate/20140307052327_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140307045916_create_servers.rb +++ b/db/migrate/20140307052327_create_servers.rb diff --git a/db/migrate/20140307045922_create_matches.rb b/db/migrate/20140307052331_create_matches.rb index 325863d..67a5b7b 100644 --- a/db/migrate/20140307045922_create_matches.rb +++ b/db/migrate/20140307052331_create_matches.rb @@ -3,6 +3,7 @@ class CreateMatches < ActiveRecord::Migration create_table :matches do |t| t.references :tournament, index: true t.string :name + t.references :winner, index: true t.timestamps end diff --git a/db/migrate/20140307045927_create_teams.rb b/db/migrate/20140307052334_create_teams.rb index fdf9a68..fdf9a68 100644 --- a/db/migrate/20140307045927_create_teams.rb +++ b/db/migrate/20140307052334_create_teams.rb diff --git a/db/migrate/20140307045934_create_alerts.rb b/db/migrate/20140307052338_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140307045934_create_alerts.rb +++ b/db/migrate/20140307052338_create_alerts.rb diff --git a/db/migrate/20140307045941_create_pms.rb b/db/migrate/20140307052342_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140307045941_create_pms.rb +++ b/db/migrate/20140307052342_create_pms.rb diff --git a/db/migrate/20140307045948_create_tournaments.rb b/db/migrate/20140307052346_create_tournaments.rb index 545e603..545e603 100644 --- a/db/migrate/20140307045948_create_tournaments.rb +++ b/db/migrate/20140307052346_create_tournaments.rb diff --git a/db/migrate/20140307045954_create_games.rb b/db/migrate/20140307052350_create_games.rb index 5e4f56f..5e4f56f 100644 --- a/db/migrate/20140307045954_create_games.rb +++ b/db/migrate/20140307052350_create_games.rb diff --git a/db/migrate/20140307050001_create_users.rb b/db/migrate/20140307052354_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140307050001_create_users.rb +++ b/db/migrate/20140307052354_create_users.rb diff --git a/db/migrate/20140307050008_create_sessions.rb b/db/migrate/20140307052358_create_sessions.rb index fe25bf2..fe25bf2 100644 --- a/db/migrate/20140307050008_create_sessions.rb +++ b/db/migrate/20140307052358_create_sessions.rb diff --git a/db/migrate/20140307050016_create_server_settings.rb b/db/migrate/20140307052402_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140307050016_create_server_settings.rb +++ b/db/migrate/20140307052402_create_server_settings.rb diff --git a/db/migrate/20140307050023_create_tournament_options.rb b/db/migrate/20140307052405_create_tournament_options.rb index 53b601c..53b601c 100644 --- a/db/migrate/20140307050023_create_tournament_options.rb +++ b/db/migrate/20140307052405_create_tournament_options.rb diff --git a/db/migrate/20140307050029_create_game_options.rb b/db/migrate/20140307052409_create_game_options.rb index 2f62ef7..2f62ef7 100644 --- a/db/migrate/20140307050029_create_game_options.rb +++ b/db/migrate/20140307052409_create_game_options.rb diff --git a/db/migrate/20140307050035_create_scores.rb b/db/migrate/20140307052413_create_scores.rb index 4ca0b0b..4ca0b0b 100644 --- a/db/migrate/20140307050035_create_scores.rb +++ b/db/migrate/20140307052413_create_scores.rb diff --git a/db/migrate/20140307050041_create_tournament_players_join_table.rb b/db/migrate/20140307052417_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140307050041_create_tournament_players_join_table.rb +++ b/db/migrate/20140307052417_create_tournament_players_join_table.rb diff --git a/db/migrate/20140307050046_create_tournament_hosts_join_table.rb b/db/migrate/20140307052421_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140307050046_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140307052421_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140307050052_create_team_user_join_table.rb b/db/migrate/20140307052424_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140307050052_create_team_user_join_table.rb +++ b/db/migrate/20140307052424_create_team_user_join_table.rb diff --git a/db/migrate/20140307050059_create_match_team_join_table.rb b/db/migrate/20140307052428_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140307050059_create_match_team_join_table.rb +++ b/db/migrate/20140307052428_create_match_team_join_table.rb diff --git a/db/migrate/20140307050124_add_hidden_attrs_to_user.rb b/db/migrate/20140307052443_add_hidden_attrs_to_user.rb index 2f1b0b2..2f1b0b2 100644 --- a/db/migrate/20140307050124_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140307052443_add_hidden_attrs_to_user.rb diff --git a/db/schema.rb b/db/schema.rb index c9c0fa6..55f4046 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140307050124) do +ActiveRecord::Schema.define(version: 20140307052443) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -50,11 +50,13 @@ ActiveRecord::Schema.define(version: 20140307050124) do create_table "matches", force: true do |t| t.integer "tournament_id" t.string "name" + t.integer "winner_id" t.datetime "created_at" t.datetime "updated_at" end add_index "matches", ["tournament_id"], name: "index_matches_on_tournament_id" + add_index "matches", ["winner_id"], name: "index_matches_on_winner_id" create_table "matches_teams", id: false, force: true do |t| t.integer "match_id", null: false |