diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-01 18:46:22 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-01 18:46:22 -0400 |
commit | 2b79a033262dfe610eb22b7f6b3614db9cb134b1 (patch) | |
tree | 2bb77aa81022e7c01cccfb67127c7acd2fbb65aa /db | |
parent | f08191c3966851b19edc949d7819cc58190037d7 (diff) | |
parent | e6b160bd81e51e0bd88e5c2563a06ea5f0d64620 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20140401215718_create_servers.rb (renamed from db/migrate/20140401205355_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215720_create_matches.rb (renamed from db/migrate/20140401205357_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215723_create_teams.rb (renamed from db/migrate/20140401205400_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215725_create_alerts.rb (renamed from db/migrate/20140401205402_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215728_create_pms.rb (renamed from db/migrate/20140401205405_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215730_create_tournaments.rb (renamed from db/migrate/20140401205407_create_tournaments.rb) | 1 | ||||
-rw-r--r-- | db/migrate/20140401215733_create_games.rb (renamed from db/migrate/20140401205410_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215735_create_users.rb (renamed from db/migrate/20140401205412_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215738_create_sessions.rb (renamed from db/migrate/20140401205415_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215740_create_server_settings.rb (renamed from db/migrate/20140401205417_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215743_create_game_settings.rb (renamed from db/migrate/20140401205420_create_game_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215745_create_tournament_preferences.rb (renamed from db/migrate/20140401205422_create_tournament_preferences.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215747_create_scores.rb (renamed from db/migrate/20140401205424_create_scores.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215750_create_remote_usernames.rb (renamed from db/migrate/20140401205427_create_remote_usernames.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215752_create_tournament_players_join_table.rb (renamed from db/migrate/20140401205429_create_tournament_players_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215755_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140401205432_create_tournament_hosts_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215757_create_team_user_join_table.rb (renamed from db/migrate/20140401205434_create_team_user_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215800_create_match_team_join_table.rb (renamed from db/migrate/20140401205437_create_match_team_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140401215809_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140401205446_add_hidden_attrs_to_user.rb) | 0 | ||||
-rw-r--r-- | db/schema.rb | 3 |
20 files changed, 1 insertions, 3 deletions
diff --git a/db/migrate/20140401205355_create_servers.rb b/db/migrate/20140401215718_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140401205355_create_servers.rb +++ b/db/migrate/20140401215718_create_servers.rb diff --git a/db/migrate/20140401205357_create_matches.rb b/db/migrate/20140401215720_create_matches.rb index 31eea12..31eea12 100644 --- a/db/migrate/20140401205357_create_matches.rb +++ b/db/migrate/20140401215720_create_matches.rb diff --git a/db/migrate/20140401205400_create_teams.rb b/db/migrate/20140401215723_create_teams.rb index fdf9a68..fdf9a68 100644 --- a/db/migrate/20140401205400_create_teams.rb +++ b/db/migrate/20140401215723_create_teams.rb diff --git a/db/migrate/20140401205402_create_alerts.rb b/db/migrate/20140401215725_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140401205402_create_alerts.rb +++ b/db/migrate/20140401215725_create_alerts.rb diff --git a/db/migrate/20140401205405_create_pms.rb b/db/migrate/20140401215728_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140401205405_create_pms.rb +++ b/db/migrate/20140401215728_create_pms.rb diff --git a/db/migrate/20140401205407_create_tournaments.rb b/db/migrate/20140401215730_create_tournaments.rb index 3e36441..55f76a3 100644 --- a/db/migrate/20140401205407_create_tournaments.rb +++ b/db/migrate/20140401215730_create_tournaments.rb @@ -4,7 +4,6 @@ class CreateTournaments < ActiveRecord::Migration t.string :name t.references :game, index: true t.integer :status - t.string :ger t.boolean :randomized_teams t.timestamps diff --git a/db/migrate/20140401205410_create_games.rb b/db/migrate/20140401215733_create_games.rb index 5e4f56f..5e4f56f 100644 --- a/db/migrate/20140401205410_create_games.rb +++ b/db/migrate/20140401215733_create_games.rb diff --git a/db/migrate/20140401205412_create_users.rb b/db/migrate/20140401215735_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140401205412_create_users.rb +++ b/db/migrate/20140401215735_create_users.rb diff --git a/db/migrate/20140401205415_create_sessions.rb b/db/migrate/20140401215738_create_sessions.rb index fe25bf2..fe25bf2 100644 --- a/db/migrate/20140401205415_create_sessions.rb +++ b/db/migrate/20140401215738_create_sessions.rb diff --git a/db/migrate/20140401205417_create_server_settings.rb b/db/migrate/20140401215740_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140401205417_create_server_settings.rb +++ b/db/migrate/20140401215740_create_server_settings.rb diff --git a/db/migrate/20140401205420_create_game_settings.rb b/db/migrate/20140401215743_create_game_settings.rb index 0ebbf18..0ebbf18 100644 --- a/db/migrate/20140401205420_create_game_settings.rb +++ b/db/migrate/20140401215743_create_game_settings.rb diff --git a/db/migrate/20140401205422_create_tournament_preferences.rb b/db/migrate/20140401215745_create_tournament_preferences.rb index 991d659..991d659 100644 --- a/db/migrate/20140401205422_create_tournament_preferences.rb +++ b/db/migrate/20140401215745_create_tournament_preferences.rb diff --git a/db/migrate/20140401205424_create_scores.rb b/db/migrate/20140401215747_create_scores.rb index 4ca0b0b..4ca0b0b 100644 --- a/db/migrate/20140401205424_create_scores.rb +++ b/db/migrate/20140401215747_create_scores.rb diff --git a/db/migrate/20140401205427_create_remote_usernames.rb b/db/migrate/20140401215750_create_remote_usernames.rb index e265985..e265985 100644 --- a/db/migrate/20140401205427_create_remote_usernames.rb +++ b/db/migrate/20140401215750_create_remote_usernames.rb diff --git a/db/migrate/20140401205429_create_tournament_players_join_table.rb b/db/migrate/20140401215752_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140401205429_create_tournament_players_join_table.rb +++ b/db/migrate/20140401215752_create_tournament_players_join_table.rb diff --git a/db/migrate/20140401205432_create_tournament_hosts_join_table.rb b/db/migrate/20140401215755_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140401205432_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140401215755_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140401205434_create_team_user_join_table.rb b/db/migrate/20140401215757_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140401205434_create_team_user_join_table.rb +++ b/db/migrate/20140401215757_create_team_user_join_table.rb diff --git a/db/migrate/20140401205437_create_match_team_join_table.rb b/db/migrate/20140401215800_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140401205437_create_match_team_join_table.rb +++ b/db/migrate/20140401215800_create_match_team_join_table.rb diff --git a/db/migrate/20140401205446_add_hidden_attrs_to_user.rb b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb index 2f1b0b2..2f1b0b2 100644 --- a/db/migrate/20140401205446_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb diff --git a/db/schema.rb b/db/schema.rb index eda2839..c3be661 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: 20140401205446) do +ActiveRecord::Schema.define(version: 20140401215809) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -155,7 +155,6 @@ ActiveRecord::Schema.define(version: 20140401205446) do t.string "name" t.integer "game_id" t.integer "status" - t.string "ger" t.boolean "randomized_teams" t.datetime "created_at" t.datetime "updated_at" |