Merge branch 'master' of http://github.com/LukeShu/leaguer

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb

14 files changed, 0 insertions, 246 deletions

diff --git a/db/migrate/20140304015655_create_servers.rb b/db/migrate/20140304015655_create_servers.rb
deleted file mode 100644
index f33241a..0000000
--- a/db/migrate/20140304015655_create_servers.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CreateServers < ActiveRecord::Migration
-  def change
-    create_table :servers do |t|
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015657_create_tournaments.rb b/db/migrate/20140304015657_create_tournaments.rb
deleted file mode 100644
index 36fcf7e..0000000
--- a/db/migrate/20140304015657_create_tournaments.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreateTournaments < ActiveRecord::Migration
-  def change
-    create_table :tournaments do |t|
-      t.references :game, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015700_create_matches.rb b/db/migrate/20140304015700_create_matches.rb
deleted file mode 100644
index 6c0c157..0000000
--- a/db/migrate/20140304015700_create_matches.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreateMatches < ActiveRecord::Migration
-  def change
-    create_table :matches do |t|
-      t.references :tournament, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015702_create_teams.rb b/db/migrate/20140304015702_create_teams.rb
deleted file mode 100644
index dd8397d..0000000
--- a/db/migrate/20140304015702_create_teams.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CreateTeams < ActiveRecord::Migration
-  def change
-    create_table :teams do |t|
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015706_create_users.rb b/db/migrate/20140304015706_create_users.rb
deleted file mode 100644
index f0986d4..0000000
--- a/db/migrate/20140304015706_create_users.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateUsers < ActiveRecord::Migration
-  def change
-    create_table :users do |t|
-      t.string :name
-      t.string :email
-      t.string :user_name
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015709_create_user_team_pairs.rb b/db/migrate/20140304015709_create_user_team_pairs.rb
deleted file mode 100644
index 2c492ac..0000000
--- a/db/migrate/20140304015709_create_user_team_pairs.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateUserTeamPairs < ActiveRecord::Migration
-  def change
-    create_table :user_team_pairs do |t|
-      t.references :user, index: true
-      t.references :team, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015711_create_team_match_pairs.rb b/db/migrate/20140304015711_create_team_match_pairs.rb
deleted file mode 100644
index 8fac07e..0000000
--- a/db/migrate/20140304015711_create_team_match_pairs.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateTeamMatchPairs < ActiveRecord::Migration
-  def change
-    create_table :team_match_pairs do |t|
-      t.references :team, index: true
-      t.references :match, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015713_create_alerts.rb b/db/migrate/20140304015713_create_alerts.rb
deleted file mode 100644
index 68a8e10..0000000
--- a/db/migrate/20140304015713_create_alerts.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateAlerts < ActiveRecord::Migration
-  def change
-    create_table :alerts do |t|
-      t.references :author, index: true
-      t.text :message
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015715_create_pms.rb b/db/migrate/20140304015715_create_pms.rb
deleted file mode 100644
index 93bb5c6..0000000
--- a/db/migrate/20140304015715_create_pms.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreatePms < ActiveRecord::Migration
-  def change
-    create_table :pms do |t|
-      t.references :author, index: true
-      t.references :recipient, index: true
-      t.text :message
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015718_create_games.rb b/db/migrate/20140304015718_create_games.rb
deleted file mode 100644
index 59d4ef0..0000000
--- a/db/migrate/20140304015718_create_games.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateGames < ActiveRecord::Migration
-  def change
-    create_table :games do |t|
-      t.text :name
-      t.integer :players_per_team
-      t.integer :teams_per_match
-      t.integer :set_rounds
-      t.integer :randomized_teams
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015720_create_game_attributes.rb b/db/migrate/20140304015720_create_game_attributes.rb
deleted file mode 100644
index b63f134..0000000
--- a/db/migrate/20140304015720_create_game_attributes.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateGameAttributes < ActiveRecord::Migration
-  def change
-    create_table :game_attributes do |t|
-      t.references :game, index: true
-      t.text :key
-      t.integer :type
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015722_create_server_settings.rb b/db/migrate/20140304015722_create_server_settings.rb
deleted file mode 100644
index dfdd91b..0000000
--- a/db/migrate/20140304015722_create_server_settings.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CreateServerSettings < ActiveRecord::Migration
-  def change
-    create_table :server_settings do |t|
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140304015729_create_tournament_options.rb b/db/migrate/20140304015729_create_tournament_options.rb
deleted file mode 100644
index d2df22e..0000000
--- a/db/migrate/20140304015729_create_tournament_options.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CreateTournamentOptions < ActiveRecord::Migration
-  def change
-    create_table :tournament_options do |t|
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
deleted file mode 100644
index 4a44343..0000000
--- a/db/schema.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema.define(version: 20140304015729) do
-
-  create_table "alerts", force: true do |t|
-    t.integer  "author_id"
-    t.text     "message"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "alerts", ["author_id"], name: "index_alerts_on_author_id"
-
-  create_table "game_attributes", force: true do |t|
-    t.integer  "game_id"
-    t.text     "key"
-    t.integer  "type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "game_attributes", ["game_id"], name: "index_game_attributes_on_game_id"
-
-  create_table "games", force: true do |t|
-    t.text     "name"
-    t.integer  "players_per_team"
-    t.integer  "teams_per_match"
-    t.integer  "set_rounds"
-    t.integer  "randomized_teams"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "matches", force: true do |t|
-    t.integer  "tournament_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "matches", ["tournament_id"], name: "index_matches_on_tournament_id"
-
-  create_table "pms", force: true do |t|
-    t.integer  "author_id"
-    t.integer  "recipient_id"
-    t.text     "message"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "pms", ["author_id"], name: "index_pms_on_author_id"
-  add_index "pms", ["recipient_id"], name: "index_pms_on_recipient_id"
-
-  create_table "server_settings", force: true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "servers", force: true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "team_match_pairs", force: true do |t|
-    t.integer  "team_id"
-    t.integer  "match_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "team_match_pairs", ["match_id"], name: "index_team_match_pairs_on_match_id"
-  add_index "team_match_pairs", ["team_id"], name: "index_team_match_pairs_on_team_id"
-
-  create_table "teams", force: true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "tournament_options", force: true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "tournaments", force: true do |t|
-    t.integer  "game_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "tournaments", ["game_id"], name: "index_tournaments_on_game_id"
-
-  create_table "user_team_pairs", force: true do |t|
-    t.integer  "user_id"
-    t.integer  "team_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  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 "users", force: true do |t|
-    t.string   "name"
-    t.string   "email"
-    t.string   "user_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-end