Merge branch 'clean' into master2

Conflicts:
	config/routes.rb

18 files changed, 16 insertions, 16 deletions

diff --git a/db/migrate/20140306222325_create_teams.rb b/db/migrate/20140307003703_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140306222325_create_teams.rb
+++ b/db/migrate/20140307003703_create_teams.rb
diff --git a/db/migrate/20140306222330_create_alerts.rb b/db/migrate/20140307003709_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140306222330_create_alerts.rb
+++ b/db/migrate/20140307003709_create_alerts.rb
diff --git a/db/migrate/20140306222336_create_pms.rb b/db/migrate/20140307003714_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140306222336_create_pms.rb
+++ b/db/migrate/20140307003714_create_pms.rb
diff --git a/db/migrate/20140306222314_create_tournaments.rb b/db/migrate/20140307003719_create_tournaments.rb
index c7ec765..545e603 100644
--- a/db/migrate/20140306222314_create_tournaments.rb
+++ b/db/migrate/20140307003719_create_tournaments.rb
@@ -2,13 +2,13 @@ class CreateTournaments < ActiveRecord::Migration
   def change
     create_table :tournaments do |t|
       t.references :game, index: true
+      t.integer :status
       t.integer :min_players_per_team
       t.integer :max_players_per_team
       t.integer :min_teams_per_match
       t.integer :max_teams_per_match
       t.integer :set_rounds
       t.boolean :randomized_teams
-      t.integer :status
 
       t.timestamps
     end
diff --git a/db/migrate/20140306222309_create_servers.rb b/db/migrate/20140307003926_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140306222309_create_servers.rb
+++ b/db/migrate/20140307003926_create_servers.rb
diff --git a/db/migrate/20140306222320_create_matches.rb b/db/migrate/20140307003931_create_matches.rb
index 325863d..325863d 100644
--- a/db/migrate/20140306222320_create_matches.rb
+++ b/db/migrate/20140307003931_create_matches.rb
diff --git a/db/migrate/20140306222341_create_games.rb b/db/migrate/20140307003956_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140306222341_create_games.rb
+++ b/db/migrate/20140307003956_create_games.rb
diff --git a/db/migrate/20140306222347_create_users.rb b/db/migrate/20140307004001_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140306222347_create_users.rb
+++ b/db/migrate/20140307004001_create_users.rb
diff --git a/db/migrate/20140306222352_create_sessions.rb b/db/migrate/20140307004006_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140306222352_create_sessions.rb
+++ b/db/migrate/20140307004006_create_sessions.rb
diff --git a/db/migrate/20140306222357_create_server_settings.rb b/db/migrate/20140307004011_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140306222357_create_server_settings.rb
+++ b/db/migrate/20140307004011_create_server_settings.rb
diff --git a/db/migrate/20140306222402_create_tournament_options.rb b/db/migrate/20140307004016_create_tournament_options.rb
index 53b601c..53b601c 100644
--- a/db/migrate/20140306222402_create_tournament_options.rb
+++ b/db/migrate/20140307004016_create_tournament_options.rb
diff --git a/db/migrate/20140306222407_create_game_options.rb b/db/migrate/20140307004021_create_game_options.rb
index 2f62ef7..2f62ef7 100644
--- a/db/migrate/20140306222407_create_game_options.rb
+++ b/db/migrate/20140307004021_create_game_options.rb
diff --git a/db/migrate/20140306222412_create_scores.rb b/db/migrate/20140307004027_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140306222412_create_scores.rb
+++ b/db/migrate/20140307004027_create_scores.rb
diff --git a/db/migrate/20140306222422_create_user_team_pairs.rb b/db/migrate/20140307004031_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140306222422_create_user_team_pairs.rb
+++ b/db/migrate/20140307004031_create_user_team_pairs.rb
diff --git a/db/migrate/20140306222417_create_tournament_user_pairs.rb b/db/migrate/20140307004036_create_user_tournament_pairs.rb
index ab72aad..9885b20 100644
--- a/db/migrate/20140306222417_create_tournament_user_pairs.rb
+++ b/db/migrate/20140307004036_create_user_tournament_pairs.rb
@@ -1,8 +1,8 @@
-class CreateTournamentUserPairs < ActiveRecord::Migration
+class CreateUserTournamentPairs < ActiveRecord::Migration
   def change
-    create_table :tournament_user_pairs do |t|
-      t.references :tournament, index: true
+    create_table :user_tournament_pairs do |t|
       t.references :user, index: true
+      t.references :tournament, index: true
 
       t.timestamps
     end
diff --git a/db/migrate/20140306222427_create_team_match_pairs.rb b/db/migrate/20140307004041_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140306222427_create_team_match_pairs.rb
+++ b/db/migrate/20140307004041_create_team_match_pairs.rb
diff --git a/db/migrate/20140306222447_add_hidden_attrs_to_user.rb b/db/migrate/20140307004100_add_hidden_attrs_to_user.rb
index 2f1b0b2..2f1b0b2 100644
--- a/db/migrate/20140306222447_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140307004100_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index eadf24e..cae1815 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: 20140306222447) do
+ActiveRecord::Schema.define(version: 20140307004100) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -120,25 +120,15 @@ ActiveRecord::Schema.define(version: 20140306222447) do
 
   add_index "tournament_options", ["tournament_id"], name: "index_tournament_options_on_tournament_id"
 
-  create_table "tournament_user_pairs", force: true do |t|
-    t.integer  "tournament_id"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "tournament_user_pairs", ["tournament_id"], name: "index_tournament_user_pairs_on_tournament_id"
-  add_index "tournament_user_pairs", ["user_id"], name: "index_tournament_user_pairs_on_user_id"
-
   create_table "tournaments", force: true do |t|
     t.integer  "game_id"
+    t.integer  "status"
     t.integer  "min_players_per_team"
     t.integer  "max_players_per_team"
     t.integer  "min_teams_per_match"
     t.integer  "max_teams_per_match"
     t.integer  "set_rounds"
     t.boolean  "randomized_teams"
-    t.integer  "status"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -155,6 +145,16 @@ ActiveRecord::Schema.define(version: 20140306222447) do
   add_index "user_team_pairs", ["team_id"], name: "index_user_team_pairs_on_team_id"
   add_index "user_team_pairs", ["user_id"], name: "index_user_team_pairs_on_user_id"
 
+  create_table "user_tournament_pairs", force: true do |t|
+    t.integer  "user_id"
+    t.integer  "tournament_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "user_tournament_pairs", ["tournament_id"], name: "index_user_tournament_pairs_on_tournament_id"
+  add_index "user_tournament_pairs", ["user_id"], name: "index_user_tournament_pairs_on_user_id"
+
   create_table "users", force: true do |t|
     t.string   "name"
     t.string   "email"