Merge branch 'clean2'

Conflicts:
	app/models/game.rb

31 files changed, 4 insertions, 4 deletions

diff --git a/db/migrate/20140423213222_create_simple_captcha_data.rb b/db/migrate/20140423214420_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140423213222_create_simple_captcha_data.rb
+++ b/db/migrate/20140423214420_create_simple_captcha_data.rb
diff --git a/db/migrate/20140424013221_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140424014418_create_mailboxer.mailboxer_engine.rb
index 690cec2..690cec2 100644
--- a/db/migrate/20140424013221_create_mailboxer.mailboxer_engine.rb
+++ b/db/migrate/20140424014418_create_mailboxer.mailboxer_engine.rb
diff --git a/db/migrate/20140424013222_add_notified_object.mailboxer_engine.rb b/db/migrate/20140424014419_add_notified_object.mailboxer_engine.rb
index 7f41ac6..7f41ac6 100644
--- a/db/migrate/20140424013222_add_notified_object.mailboxer_engine.rb
+++ b/db/migrate/20140424014419_add_notified_object.mailboxer_engine.rb
diff --git a/db/migrate/20140424013223_add_notification_code.mailboxer_engine.rb b/db/migrate/20140424014420_add_notification_code.mailboxer_engine.rb
index 04c12ef..04c12ef 100644
--- a/db/migrate/20140424013223_add_notification_code.mailboxer_engine.rb
+++ b/db/migrate/20140424014420_add_notification_code.mailboxer_engine.rb
diff --git a/db/migrate/20140424013224_add_attachments.mailboxer_engine.rb b/db/migrate/20140424014421_add_attachments.mailboxer_engine.rb
index b8d6588..b8d6588 100644
--- a/db/migrate/20140424013224_add_attachments.mailboxer_engine.rb
+++ b/db/migrate/20140424014421_add_attachments.mailboxer_engine.rb
diff --git a/db/migrate/20140424013225_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140424014422_rename_receipts_read.mailboxer_engine.rb
index 9ce904f..9ce904f 100644
--- a/db/migrate/20140424013225_rename_receipts_read.mailboxer_engine.rb
+++ b/db/migrate/20140424014422_rename_receipts_read.mailboxer_engine.rb
diff --git a/db/migrate/20140424013226_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140424014423_add_global_notification_support.mailboxer_engine.rb
index 60f67ab..60f67ab 100644
--- a/db/migrate/20140424013226_add_global_notification_support.mailboxer_engine.rb
+++ b/db/migrate/20140424014423_add_global_notification_support.mailboxer_engine.rb
diff --git a/db/migrate/20140424013227_create_delayed_jobs.rb b/db/migrate/20140424014424_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140424013227_create_delayed_jobs.rb
+++ b/db/migrate/20140424014424_create_delayed_jobs.rb
diff --git a/db/migrate/20140424013228_create_servers.rb b/db/migrate/20140424014425_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140424013228_create_servers.rb
+++ b/db/migrate/20140424014425_create_servers.rb
diff --git a/db/migrate/20140424013229_create_matches.rb b/db/migrate/20140424014426_create_matches.rb
index bac92d1..bac92d1 100644
--- a/db/migrate/20140424013229_create_matches.rb
+++ b/db/migrate/20140424014426_create_matches.rb
diff --git a/db/migrate/20140424013230_create_teams.rb b/db/migrate/20140424014427_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140424013230_create_teams.rb
+++ b/db/migrate/20140424014427_create_teams.rb
diff --git a/db/migrate/20140424013231_create_alerts.rb b/db/migrate/20140424014428_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140424013231_create_alerts.rb
+++ b/db/migrate/20140424014428_create_alerts.rb
diff --git a/db/migrate/20140424013232_create_pms.rb b/db/migrate/20140424014429_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140424013232_create_pms.rb
+++ b/db/migrate/20140424014429_create_pms.rb
diff --git a/db/migrate/20140424013233_create_tournaments.rb b/db/migrate/20140424014431_create_tournaments.rb
index 716871f..716871f 100644
--- a/db/migrate/20140424013233_create_tournaments.rb
+++ b/db/migrate/20140424014431_create_tournaments.rb
diff --git a/db/migrate/20140424013234_create_games.rb b/db/migrate/20140424014433_create_games.rb
index 46ed30d..23edf0b 100644
--- a/db/migrate/20140424013234_create_games.rb
+++ b/db/migrate/20140424014433_create_games.rb
@@ -1,6 +1,7 @@
 class CreateGames < ActiveRecord::Migration
   def change
     create_table :games do |t|
+      t.references :parent, index: true
       t.string :name
       t.integer :min_players_per_team
       t.integer :max_players_per_team
diff --git a/db/migrate/20140424013236_create_users.rb b/db/migrate/20140424014434_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140424013236_create_users.rb
+++ b/db/migrate/20140424014434_create_users.rb
diff --git a/db/migrate/20140424013237_create_sessions.rb b/db/migrate/20140424014436_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140424013237_create_sessions.rb
+++ b/db/migrate/20140424014436_create_sessions.rb
diff --git a/db/migrate/20140424013239_create_brackets.rb b/db/migrate/20140424014437_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140424013239_create_brackets.rb
+++ b/db/migrate/20140424014437_create_brackets.rb
diff --git a/db/migrate/20140424013241_create_game_settings.rb b/db/migrate/20140424014439_create_game_settings.rb
index 502b4fe..06fb72e 100644
--- a/db/migrate/20140424013241_create_game_settings.rb
+++ b/db/migrate/20140424014439_create_game_settings.rb
@@ -8,7 +8,6 @@ class CreateGameSettings < ActiveRecord::Migration
       t.text :description
       t.integer :display_order
       t.text :default
-      t.references :parent, index: true
 
       t.timestamps
     end
diff --git a/db/migrate/20140424013242_create_tournament_settings.rb b/db/migrate/20140424014440_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140424013242_create_tournament_settings.rb
+++ b/db/migrate/20140424014440_create_tournament_settings.rb
diff --git a/db/migrate/20140424013244_create_tournament_stages.rb b/db/migrate/20140424014442_create_tournament_stages.rb
index e3668cb..e3668cb 100644
--- a/db/migrate/20140424013244_create_tournament_stages.rb
+++ b/db/migrate/20140424014442_create_tournament_stages.rb
diff --git a/db/migrate/20140424013245_create_statistics.rb b/db/migrate/20140424014443_create_statistics.rb
index cc2e97d..cc2e97d 100644
--- a/db/migrate/20140424013245_create_statistics.rb
+++ b/db/migrate/20140424014443_create_statistics.rb
diff --git a/db/migrate/20140424013247_create_remote_usernames.rb b/db/migrate/20140424014445_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140424013247_create_remote_usernames.rb
+++ b/db/migrate/20140424014445_create_remote_usernames.rb
diff --git a/db/migrate/20140424013248_create_bracket_matches.rb b/db/migrate/20140424014446_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140424013248_create_bracket_matches.rb
+++ b/db/migrate/20140424014446_create_bracket_matches.rb
diff --git a/db/migrate/20140424013250_create_api_requests.rb b/db/migrate/20140424014448_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140424013250_create_api_requests.rb
+++ b/db/migrate/20140424014448_create_api_requests.rb
diff --git a/db/migrate/20140424013251_create_tournament_players_join_table.rb b/db/migrate/20140424014449_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140424013251_create_tournament_players_join_table.rb
+++ b/db/migrate/20140424014449_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140424013253_create_tournament_hosts_join_table.rb b/db/migrate/20140424014451_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140424013253_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140424014451_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140424013254_create_team_user_join_table.rb b/db/migrate/20140424014452_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140424013254_create_team_user_join_table.rb
+++ b/db/migrate/20140424014452_create_team_user_join_table.rb
diff --git a/db/migrate/20140424013256_create_match_team_join_table.rb b/db/migrate/20140424014454_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140424013256_create_match_team_join_table.rb
+++ b/db/migrate/20140424014454_create_match_team_join_table.rb
diff --git a/db/migrate/20140424013300_add_hidden_attrs_to_user.rb b/db/migrate/20140424014459_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140424013300_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140424014459_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index efe99b5..0e9202a 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: 20140424013300) do
+ActiveRecord::Schema.define(version: 20140424014459) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -81,15 +81,14 @@ ActiveRecord::Schema.define(version: 20140424013300) do
     t.text     "description"
     t.integer  "display_order"
     t.text     "default"
-    t.integer  "parent_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "game_settings", ["game_id"], name: "index_game_settings_on_game_id"
-  add_index "game_settings", ["parent_id"], name: "index_game_settings_on_parent_id"
 
   create_table "games", force: true do |t|
+    t.integer  "parent_id"
     t.string   "name"
     t.integer  "min_players_per_team"
     t.integer  "max_players_per_team"
@@ -103,6 +102,7 @@ ActiveRecord::Schema.define(version: 20140424013300) do
   end
 
   add_index "games", ["name"], name: "index_games_on_name", unique: true
+  add_index "games", ["parent_id"], name: "index_games_on_parent_id"
 
   create_table "hosts_tournaments", id: false, force: true do |t|
     t.integer "host_id",       null: false