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

diff --git a/spec/models/alert_spec.rb b/spec/models/alert_spec.rb
deleted file mode 100644
index d7fa4af..0000000
--- a/spec/models/alert_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Alert do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/game_attribute_spec.rb b/spec/models/game_attribute_spec.rb
deleted file mode 100644
index 200e59b..0000000
--- a/spec/models/game_attribute_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe GameAttribute do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/game_spec.rb b/spec/models/game_spec.rb
deleted file mode 100644
index 8c56446..0000000
--- a/spec/models/game_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Game do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/match_spec.rb b/spec/models/match_spec.rb
deleted file mode 100644
index 86931c9..0000000
--- a/spec/models/match_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Match do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/pm_spec.rb b/spec/models/pm_spec.rb
deleted file mode 100644
index d56845b..0000000
--- a/spec/models/pm_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Pm do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/server_settings_spec.rb b/spec/models/server_settings_spec.rb
deleted file mode 100644
index d579746..0000000
--- a/spec/models/server_settings_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe ServerSettings do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/server_spec.rb b/spec/models/server_spec.rb
deleted file mode 100644
index 646344a..0000000
--- a/spec/models/server_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Server do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/team_match_pair_spec.rb b/spec/models/team_match_pair_spec.rb
deleted file mode 100644
index 676c563..0000000
--- a/spec/models/team_match_pair_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe TeamMatchPair do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
deleted file mode 100644
index 666a904..0000000
--- a/spec/models/team_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Team do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/tournament_option_spec.rb b/spec/models/tournament_option_spec.rb
deleted file mode 100644
index 501b316..0000000
--- a/spec/models/tournament_option_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe TournamentOption do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/tournament_spec.rb b/spec/models/tournament_spec.rb
deleted file mode 100644
index 56c919d..0000000
--- a/spec/models/tournament_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Tournament do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
deleted file mode 100644
index 44032b4..0000000
--- a/spec/models/user_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe User do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/user_team_pair_spec.rb b/spec/models/user_team_pair_spec.rb
deleted file mode 100644
index 9947368..0000000
--- a/spec/models/user_team_pair_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe UserTeamPair do
-  pending "add some examples to (or delete) #{__FILE__}"
-end