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

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

7 files changed, 0 insertions, 62 deletions

diff --git a/app/views/teams/_form.html.erb b/app/views/teams/_form.html.erb
deleted file mode 100644
index fd10129..0000000
--- a/app/views/teams/_form.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= form_for(@team) do |f| %>
-  <% if @team.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@team.errors.count, "error") %> prohibited this team from being saved:</h2>
-
-      <ul>
-      <% @team.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
diff --git a/app/views/teams/edit.html.erb b/app/views/teams/edit.html.erb
deleted file mode 100644
index 49858ad..0000000
--- a/app/views/teams/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing team</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @team %> |
-<%= link_to 'Back', teams_path %>
diff --git a/app/views/teams/index.html.erb b/app/views/teams/index.html.erb
deleted file mode 100644
index b077e10..0000000
--- a/app/views/teams/index.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<h1>Listing teams</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @teams.each do |team| %>
-      <tr>
-        <td><%= link_to 'Show', team %></td>
-        <td><%= link_to 'Edit', edit_team_path(team) %></td>
-        <td><%= link_to 'Destroy', team, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Team', new_team_path %>
diff --git a/app/views/teams/index.json.jbuilder b/app/views/teams/index.json.jbuilder
deleted file mode 100644
index b29428b..0000000
--- a/app/views/teams/index.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.array!(@teams) do |team|
-  json.extract! team, :id
-  json.url team_url(team, format: :json)
-end
diff --git a/app/views/teams/new.html.erb b/app/views/teams/new.html.erb
deleted file mode 100644
index 433d944..0000000
--- a/app/views/teams/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New team</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', teams_path %>
diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb
deleted file mode 100644
index 5b18d33..0000000
--- a/app/views/teams/show.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<%= link_to 'Edit', edit_team_path(@team) %> |
-<%= link_to 'Back', teams_path %>
diff --git a/app/views/teams/show.json.jbuilder b/app/views/teams/show.json.jbuilder
deleted file mode 100644
index 1538019..0000000
--- a/app/views/teams/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.extract! @team, :id, :created_at, :updated_at