30 files changed, 4 insertions, 1 deletions
diff --git a/db/migrate/20140424190540_create_simple_captcha_data.rb b/db/migrate/20140426201409_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140424190540_create_simple_captcha_data.rb
+++ b/db/migrate/20140426201409_create_simple_captcha_data.rb
diff --git a/db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb
index 690cec2..690cec2 100644
--- a/db/migrate/20140424230536_create_mailboxer.mailboxer_engine.rb
+++ b/db/migrate/20140427001406_create_mailboxer.mailboxer_engine.rb
diff --git a/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb b/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb
index 7f41ac6..7f41ac6 100644
--- a/db/migrate/20140424230537_add_notified_object.mailboxer_engine.rb
+++ b/db/migrate/20140427001407_add_notified_object.mailboxer_engine.rb
diff --git a/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb b/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb
index 04c12ef..04c12ef 100644
--- a/db/migrate/20140424230538_add_notification_code.mailboxer_engine.rb
+++ b/db/migrate/20140427001408_add_notification_code.mailboxer_engine.rb
diff --git a/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb b/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb
index b8d6588..b8d6588 100644
--- a/db/migrate/20140424230539_add_attachments.mailboxer_engine.rb
+++ b/db/migrate/20140427001409_add_attachments.mailboxer_engine.rb
diff --git a/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb
index 9ce904f..9ce904f 100644
--- a/db/migrate/20140424230540_rename_receipts_read.mailboxer_engine.rb
+++ b/db/migrate/20140427001410_rename_receipts_read.mailboxer_engine.rb
diff --git a/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb
index 60f67ab..60f67ab 100644
--- a/db/migrate/20140424230541_add_global_notification_support.mailboxer_engine.rb
+++ b/db/migrate/20140427001411_add_global_notification_support.mailboxer_engine.rb
diff --git a/db/migrate/20140424230543_create_delayed_jobs.rb b/db/migrate/20140427001413_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140424230543_create_delayed_jobs.rb
+++ b/db/migrate/20140427001413_create_delayed_jobs.rb
diff --git a/db/migrate/20140424230547_create_servers.rb b/db/migrate/20140427001416_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140424230547_create_servers.rb
+++ b/db/migrate/20140427001416_create_servers.rb
diff --git a/db/migrate/20140424230550_create_matches.rb b/db/migrate/20140427001420_create_matches.rb
index bac92d1..bac92d1 100644
--- a/db/migrate/20140424230550_create_matches.rb
+++ b/db/migrate/20140427001420_create_matches.rb
diff --git a/db/migrate/20140424230554_create_teams.rb b/db/migrate/20140427001424_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140424230554_create_teams.rb
+++ b/db/migrate/20140427001424_create_teams.rb
diff --git a/db/migrate/20140424230558_create_alerts.rb b/db/migrate/20140427001428_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140424230558_create_alerts.rb
+++ b/db/migrate/20140427001428_create_alerts.rb
diff --git a/db/migrate/20140424230602_create_pms.rb b/db/migrate/20140427001431_create_pms.rb
index eb9f443..eb9f443 100644
--- a/db/migrate/20140424230602_create_pms.rb
+++ b/db/migrate/20140427001431_create_pms.rb
diff --git a/db/migrate/20140424230605_create_tournaments.rb b/db/migrate/20140427001435_create_tournaments.rb
index 716871f..03b42b2 100644
--- a/db/migrate/20140424230605_create_tournaments.rb
+++ b/db/migrate/20140427001435_create_tournaments.rb
@@ -11,6 +11,7 @@ class CreateTournaments < ActiveRecord::Migration
       t.integer :set_rounds
       t.boolean :randomized_teams
       t.string :sampling_method
+      t.string :scoring_method
 
       t.timestamps
     end
diff --git a/db/migrate/20140424230609_create_games.rb b/db/migrate/20140427001439_create_games.rb
index 23edf0b..fe2e596 100644
--- a/db/migrate/20140424230609_create_games.rb
+++ b/db/migrate/20140427001439_create_games.rb
@@ -10,6 +10,7 @@ class CreateGames < ActiveRecord::Migration
       t.integer :set_rounds
       t.boolean :randomized_teams
       t.string :sampling_method
+      t.string :scoring_method
 
       t.timestamps
     end
diff --git a/db/migrate/20140424230613_create_users.rb b/db/migrate/20140427001443_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140424230613_create_users.rb
+++ b/db/migrate/20140427001443_create_users.rb
diff --git a/db/migrate/20140424230617_create_sessions.rb b/db/migrate/20140427001446_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140424230617_create_sessions.rb
+++ b/db/migrate/20140427001446_create_sessions.rb
diff --git a/db/migrate/20140424230620_create_brackets.rb b/db/migrate/20140427001450_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140424230620_create_brackets.rb
+++ b/db/migrate/20140427001450_create_brackets.rb
diff --git a/db/migrate/20140424230624_create_game_settings.rb b/db/migrate/20140427001454_create_game_settings.rb
index 06fb72e..06fb72e 100644
--- a/db/migrate/20140424230624_create_game_settings.rb
+++ b/db/migrate/20140427001454_create_game_settings.rb
diff --git a/db/migrate/20140424230628_create_tournament_settings.rb b/db/migrate/20140427001458_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140424230628_create_tournament_settings.rb
+++ b/db/migrate/20140427001458_create_tournament_settings.rb
diff --git a/db/migrate/20140424230632_create_tournament_stages.rb b/db/migrate/20140427001502_create_tournament_stages.rb
index e3668cb..6e52bf0 100644
--- a/db/migrate/20140424230632_create_tournament_stages.rb
+++ b/db/migrate/20140427001502_create_tournament_stages.rb
@@ -2,8 +2,9 @@ class CreateTournamentStages < ActiveRecord::Migration
   def change
     create_table :tournament_stages do |t|
       t.references :tournament, index: true
-      t.string :scheduling
       t.text :structure
+      t.string :scheduling_method
+      t.string :seeding_method
 
       t.timestamps
     end
diff --git a/db/migrate/20140424230635_create_statistics.rb b/db/migrate/20140427001505_create_statistics.rb
index cc2e97d..cc2e97d 100644
--- a/db/migrate/20140424230635_create_statistics.rb
+++ b/db/migrate/20140427001505_create_statistics.rb
diff --git a/db/migrate/20140424230639_create_remote_usernames.rb b/db/migrate/20140427001509_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140424230639_create_remote_usernames.rb
+++ b/db/migrate/20140427001509_create_remote_usernames.rb
diff --git a/db/migrate/20140424230643_create_bracket_matches.rb b/db/migrate/20140427001513_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140424230643_create_bracket_matches.rb
+++ b/db/migrate/20140427001513_create_bracket_matches.rb
diff --git a/db/migrate/20140424230646_create_api_requests.rb b/db/migrate/20140427001516_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140424230646_create_api_requests.rb
+++ b/db/migrate/20140427001516_create_api_requests.rb
diff --git a/db/migrate/20140424230650_create_tournament_players_join_table.rb b/db/migrate/20140427001520_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140424230650_create_tournament_players_join_table.rb
+++ b/db/migrate/20140427001520_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140424230654_create_tournament_hosts_join_table.rb b/db/migrate/20140427001523_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140424230654_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140427001523_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140424230657_create_team_user_join_table.rb b/db/migrate/20140427001527_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140424230657_create_team_user_join_table.rb
+++ b/db/migrate/20140427001527_create_team_user_join_table.rb
diff --git a/db/migrate/20140424230701_create_match_team_join_table.rb b/db/migrate/20140427001531_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140424230701_create_match_team_join_table.rb
+++ b/db/migrate/20140427001531_create_match_team_join_table.rb
diff --git a/db/migrate/20140424230712_add_hidden_attrs_to_user.rb b/db/migrate/20140427001542_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140424230712_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140427001542_add_hidden_attrs_to_user.rb