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, 36 deletions

diff --git a/app/models/alert.rb b/app/models/alert.rb
deleted file mode 100644
index 343c269..0000000
--- a/app/models/alert.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Alert < ActiveRecord::Base
-  belongs_to :author
-end
diff --git a/app/models/game.rb b/app/models/game.rb
deleted file mode 100644
index a181c26..0000000
--- a/app/models/game.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Game < ActiveRecord::Base
-end
diff --git a/app/models/game_attribute.rb b/app/models/game_attribute.rb
deleted file mode 100644
index c12723b..0000000
--- a/app/models/game_attribute.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class GameAttribute < ActiveRecord::Base
-  belongs_to :game
-end
diff --git a/app/models/match.rb b/app/models/match.rb
deleted file mode 100644
index 533435a..0000000
--- a/app/models/match.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Match < ActiveRecord::Base
-  belongs_to :tournament
-end
diff --git a/app/models/pm.rb b/app/models/pm.rb
deleted file mode 100644
index ab5af3b..0000000
--- a/app/models/pm.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class Pm < ActiveRecord::Base
-  belongs_to :author
-  belongs_to :recipient
-end
diff --git a/app/models/server.rb b/app/models/server.rb
deleted file mode 100644
index 120f0fa..0000000
--- a/app/models/server.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Server < ActiveRecord::Base
-end
diff --git a/app/models/server_settings.rb b/app/models/server_settings.rb
deleted file mode 100644
index 7f49863..0000000
--- a/app/models/server_settings.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class ServerSettings < ActiveRecord::Base
-end
diff --git a/app/models/team.rb b/app/models/team.rb
deleted file mode 100644
index fa7ba9e..0000000
--- a/app/models/team.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class Team < ActiveRecord::Base
-end
diff --git a/app/models/team_match_pair.rb b/app/models/team_match_pair.rb
deleted file mode 100644
index 85f8eaa..0000000
--- a/app/models/team_match_pair.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class TeamMatchPair < ActiveRecord::Base
-  belongs_to :team
-  belongs_to :match
-end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
deleted file mode 100644
index cc915a0..0000000
--- a/app/models/tournament.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class Tournament < ActiveRecord::Base
-  belongs_to :game
-end
diff --git a/app/models/tournament_option.rb b/app/models/tournament_option.rb
deleted file mode 100644
index 950b351..0000000
--- a/app/models/tournament_option.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class TournamentOption < ActiveRecord::Base
-end
diff --git a/app/models/user.rb b/app/models/user.rb
deleted file mode 100644
index 4a57cf0..0000000
--- a/app/models/user.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class User < ActiveRecord::Base
-end
diff --git a/app/models/user_team_pair.rb b/app/models/user_team_pair.rb
deleted file mode 100644
index c55dc2e..0000000
--- a/app/models/user_team_pair.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class UserTeamPair < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :team
-end