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

diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
deleted file mode 100644
index 34494c3..0000000
--- a/app/views/matches/_form.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%= form_for(@match) do |f| %>
-  <% if @match.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@match.errors.count, "error") %> prohibited this match from being saved:</h2>
-
-      <ul>
-      <% @match.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :tournament_id %><br>
-    <%= f.text_field :tournament_id %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
diff --git a/app/views/matches/edit.html.erb b/app/views/matches/edit.html.erb
deleted file mode 100644
index 38b7d70..0000000
--- a/app/views/matches/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing match</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @match %> |
-<%= link_to 'Back', matches_path %>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
deleted file mode 100644
index d8122ac..0000000
--- a/app/views/matches/index.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>Listing matches</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Tournament</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @matches.each do |match| %>
-      <tr>
-        <td><%= match.tournament %></td>
-        <td><%= link_to 'Show', match %></td>
-        <td><%= link_to 'Edit', edit_match_path(match) %></td>
-        <td><%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Match', new_match_path %>
diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder
deleted file mode 100644
index c8ada7a..0000000
--- a/app/views/matches/index.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.array!(@matches) do |match|
-  json.extract! match, :id, :tournament_id
-  json.url match_url(match, format: :json)
-end
diff --git a/app/views/matches/new.html.erb b/app/views/matches/new.html.erb
deleted file mode 100644
index bd4c78c..0000000
--- a/app/views/matches/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New match</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', matches_path %>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
deleted file mode 100644
index 7bab721..0000000
--- a/app/views/matches/show.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Tournament:</strong>
-  <%= @match.tournament %>
-</p>
-
-<%= link_to 'Edit', edit_match_path(@match) %> |
-<%= link_to 'Back', matches_path %>
diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder
deleted file mode 100644
index 2e45395..0000000
--- a/app/views/matches/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.extract! @match, :id, :tournament_id, :created_at, :updated_at