Merge branch 'clean2'

Conflicts:
	app/models/team.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb

25 files changed, 3 insertions, 9 deletions

diff --git a/db/migrate/20140422021622_create_simple_captcha_data.rb b/db/migrate/20140422155038_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140422021622_create_simple_captcha_data.rb
+++ b/db/migrate/20140422155038_create_simple_captcha_data.rb
diff --git a/db/migrate/20140422061625_create_delayed_jobs.rb b/db/migrate/20140422195042_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140422061625_create_delayed_jobs.rb
+++ b/db/migrate/20140422195042_create_delayed_jobs.rb
diff --git a/db/migrate/20140422061628_create_servers.rb b/db/migrate/20140422195045_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140422061628_create_servers.rb
+++ b/db/migrate/20140422195045_create_servers.rb
diff --git a/db/migrate/20140422061631_create_matches.rb b/db/migrate/20140422195049_create_matches.rb
index 3786d52..bac92d1 100644
--- a/db/migrate/20140422061631_create_matches.rb
+++ b/db/migrate/20140422195049_create_matches.rb
@@ -3,9 +3,8 @@ class CreateMatches < ActiveRecord::Migration
     create_table :matches do |t|
       t.integer :status
       t.references :tournament_stage, index: true
-      t.string :name
       t.references :winner, index: true
-      t.string :remote_id
+      t.text :remote_id
       t.integer :submitted_peer_evaluations
 
       t.timestamps
diff --git a/db/migrate/20140422061633_create_teams.rb b/db/migrate/20140422195052_create_teams.rb
index fdf9a68..dd8397d 100644
--- a/db/migrate/20140422061633_create_teams.rb
+++ b/db/migrate/20140422195052_create_teams.rb
@@ -1,7 +1,6 @@
 class CreateTeams < ActiveRecord::Migration
   def change
     create_table :teams do |t|
-      t.references :match, index: true
 
       t.timestamps
     end
diff --git a/db/migrate/20140422061636_create_alerts.rb b/db/migrate/20140422195056_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140422061636_create_alerts.rb
+++ b/db/migrate/20140422195056_create_alerts.rb
diff --git a/db/migrate/20140422061639_create_pms.rb b/db/migrate/20140422195059_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140422061639_create_pms.rb
+++ b/db/migrate/20140422195059_create_pms.rb
diff --git a/db/migrate/20140422061642_create_tournaments.rb b/db/migrate/20140422195103_create_tournaments.rb
index 716871f..716871f 100644
--- a/db/migrate/20140422061642_create_tournaments.rb
+++ b/db/migrate/20140422195103_create_tournaments.rb
diff --git a/db/migrate/20140422061645_create_games.rb b/db/migrate/20140422195107_create_games.rb
index 46ed30d..46ed30d 100644
--- a/db/migrate/20140422061645_create_games.rb
+++ b/db/migrate/20140422195107_create_games.rb
diff --git a/db/migrate/20140422061648_create_users.rb b/db/migrate/20140422195110_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140422061648_create_users.rb
+++ b/db/migrate/20140422195110_create_users.rb
diff --git a/db/migrate/20140422061651_create_sessions.rb b/db/migrate/20140422195114_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140422061651_create_sessions.rb
+++ b/db/migrate/20140422195114_create_sessions.rb
diff --git a/db/migrate/20140422061654_create_brackets.rb b/db/migrate/20140422195118_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140422061654_create_brackets.rb
+++ b/db/migrate/20140422195118_create_brackets.rb
diff --git a/db/migrate/20140422061657_create_game_settings.rb b/db/migrate/20140422195121_create_game_settings.rb
index 06fb72e..06fb72e 100644
--- a/db/migrate/20140422061657_create_game_settings.rb
+++ b/db/migrate/20140422195121_create_game_settings.rb
diff --git a/db/migrate/20140422061700_create_tournament_settings.rb b/db/migrate/20140422195125_create_tournament_settings.rb
index e56697f..e56697f 100644
--- a/db/migrate/20140422061700_create_tournament_settings.rb
+++ b/db/migrate/20140422195125_create_tournament_settings.rb
diff --git a/db/migrate/20140422061703_create_tournament_stages.rb b/db/migrate/20140422195128_create_tournament_stages.rb
index e3668cb..e3668cb 100644
--- a/db/migrate/20140422061703_create_tournament_stages.rb
+++ b/db/migrate/20140422195128_create_tournament_stages.rb
diff --git a/db/migrate/20140422061706_create_statistics.rb b/db/migrate/20140422195132_create_statistics.rb
index cc2e97d..cc2e97d 100644
--- a/db/migrate/20140422061706_create_statistics.rb
+++ b/db/migrate/20140422195132_create_statistics.rb
diff --git a/db/migrate/20140422061709_create_remote_usernames.rb b/db/migrate/20140422195135_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140422061709_create_remote_usernames.rb
+++ b/db/migrate/20140422195135_create_remote_usernames.rb
diff --git a/db/migrate/20140422061712_create_bracket_matches.rb b/db/migrate/20140422195139_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140422061712_create_bracket_matches.rb
+++ b/db/migrate/20140422195139_create_bracket_matches.rb
diff --git a/db/migrate/20140422061715_create_api_requests.rb b/db/migrate/20140422195143_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140422061715_create_api_requests.rb
+++ b/db/migrate/20140422195143_create_api_requests.rb
diff --git a/db/migrate/20140422061718_create_tournament_players_join_table.rb b/db/migrate/20140422195146_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140422061718_create_tournament_players_join_table.rb
+++ b/db/migrate/20140422195146_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140422061721_create_tournament_hosts_join_table.rb b/db/migrate/20140422195150_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140422061721_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140422195150_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140422061724_create_team_user_join_table.rb b/db/migrate/20140422195153_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140422061724_create_team_user_join_table.rb
+++ b/db/migrate/20140422195153_create_team_user_join_table.rb
diff --git a/db/migrate/20140422061727_create_match_team_join_table.rb b/db/migrate/20140422195157_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140422061727_create_match_team_join_table.rb
+++ b/db/migrate/20140422195157_create_match_team_join_table.rb
diff --git a/db/migrate/20140422061739_add_hidden_attrs_to_user.rb b/db/migrate/20140422195211_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140422061739_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140422195211_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index e8764b6..3f39538 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: 20140422061739) do
+ActiveRecord::Schema.define(version: 20140422195211) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -104,9 +104,8 @@ ActiveRecord::Schema.define(version: 20140422061739) do
   create_table "matches", force: true do |t|
     t.integer  "status"
     t.integer  "tournament_stage_id"
-    t.string   "name"
     t.integer  "winner_id"
-    t.string   "remote_id"
+    t.text     "remote_id"
     t.integer  "submitted_peer_evaluations"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -185,13 +184,10 @@ ActiveRecord::Schema.define(version: 20140422061739) do
   add_index "statistics", ["user_id"], name: "index_statistics_on_user_id"
 
   create_table "teams", force: true do |t|
-    t.integer  "match_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "teams", ["match_id"], name: "index_teams_on_match_id"
-
   create_table "teams_users", id: false, force: true do |t|
     t.integer "team_id", null: false
     t.integer "user_id", null: false