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/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
deleted file mode 100644
index 1fd63e9..0000000
--- a/app/views/tournaments/_form.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%= form_for(@tournament) do |f| %>
-  <% if @tournament.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@tournament.errors.count, "error") %> prohibited this tournament from being saved:</h2>
-
-      <ul>
-      <% @tournament.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :game_id %><br>
-    <%= f.text_field :game_id %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
diff --git a/app/views/tournaments/edit.html.erb b/app/views/tournaments/edit.html.erb
deleted file mode 100644
index 2913025..0000000
--- a/app/views/tournaments/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing tournament</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @tournament %> |
-<%= link_to 'Back', tournaments_path %>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
deleted file mode 100644
index ad2b7cf..0000000
--- a/app/views/tournaments/index.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>Listing tournaments</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Game</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @tournaments.each do |tournament| %>
-      <tr>
-        <td><%= tournament.game %></td>
-        <td><%= link_to 'Show', tournament %></td>
-        <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td>
-        <td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Tournament', new_tournament_path %>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
deleted file mode 100644
index e6f3b49..0000000
--- a/app/views/tournaments/index.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.array!(@tournaments) do |tournament|
-  json.extract! tournament, :id, :game_id
-  json.url tournament_url(tournament, format: :json)
-end
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
deleted file mode 100644
index 2a60539..0000000
--- a/app/views/tournaments/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New tournament</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', tournaments_path %>
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
deleted file mode 100644
index 30df788..0000000
--- a/app/views/tournaments/show.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Game:</strong>
-  <%= @tournament.game %>
-</p>
-
-<%= link_to 'Edit', edit_tournament_path(@tournament) %> |
-<%= link_to 'Back', tournaments_path %>
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
deleted file mode 100644
index 0fe65a6..0000000
--- a/app/views/tournaments/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.extract! @tournament, :id, :game_id, :created_at, :updated_at