diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:25:38 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:25:38 -0500 |
commit | c1f714a479eb7ca9e9125e283361a471dd928278 (patch) | |
tree | 5d4a35af99b629d83afe86c81de6ef46669ef238 /db/schema.rb | |
parent | fff1ca96f63833d7d08ca3f95fb13284e517b69d (diff) |
Merge branch 'clean'
Conflicts:
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043624_create_teams.rb
db/migrate/20140304043626_create_alerts.rb
db/migrate/20140304043629_create_pms.rb
db/migrate/20140304043633_create_users.rb
db/migrate/20140304043637_create_server_settings.rb
db/migrate/20140304043700_create_tournament_options.rb
db/migrate/20140307045916_create_servers.rb
db/migrate/20140307045922_create_matches.rb
db/migrate/20140307045927_create_teams.rb
db/migrate/20140307045934_create_alerts.rb
db/migrate/20140307045941_create_pms.rb
db/migrate/20140307050001_create_users.rb
db/migrate/20140307050016_create_server_settings.rb
db/migrate/20140307050023_create_tournament_options.rb
db/migrate/20140307051752_create_servers.rb
db/migrate/20140307051756_create_tournaments.rb
db/migrate/20140307051800_create_matches.rb
db/migrate/20140307051804_create_teams.rb
db/migrate/20140307051808_create_alerts.rb
db/migrate/20140307051812_create_pms.rb
db/migrate/20140307051816_create_games.rb
db/migrate/20140307051820_create_users.rb
db/migrate/20140307051824_create_game_attributes.rb
db/migrate/20140307051827_create_server_settings.rb
db/migrate/20140307051831_create_user_team_pairs.rb
db/migrate/20140307051835_create_team_match_pairs.rb
db/migrate/20140307051853_add_index_to_users_email.rb
db/migrate/20140307051857_add_index_to_users_user_name.rb
db/migrate/20140307051901_add_password_digest_to_users.rb
db/migrate/20140307051904_add_remember_token_to_users.rb
db/migrate/20140307051908_create_tournament_options.rb
db/schema.rb
generate.sh
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |