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

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

13 files changed, 0 insertions, 126 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