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

diff --git a/app/views/alerts/_form.html.erb b/app/views/alerts/_form.html.erb
deleted file mode 100644
index b60eaf2..0000000
--- a/app/views/alerts/_form.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%= form_for(@alert) do |f| %>
-  <% if @alert.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@alert.errors.count, "error") %> prohibited this alert from being saved:</h2>
-
-      <ul>
-      <% @alert.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :author_id %><br>
-    <%= f.text_field :author_id %>
-  </div>
-  <div class="field">
-    <%= f.label :message %><br>
-    <%= f.text_area :message %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
diff --git a/app/views/alerts/edit.html.erb b/app/views/alerts/edit.html.erb
deleted file mode 100644
index ad99164..0000000
--- a/app/views/alerts/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing alert</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @alert %> |
-<%= link_to 'Back', alerts_path %>
diff --git a/app/views/alerts/index.html.erb b/app/views/alerts/index.html.erb
deleted file mode 100644
index 458b951..0000000
--- a/app/views/alerts/index.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<h1>Listing alerts</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Author</th>
-      <th>Message</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @alerts.each do |alert| %>
-      <tr>
-        <td><%= alert.author %></td>
-        <td><%= alert.message %></td>
-        <td><%= link_to 'Show', alert %></td>
-        <td><%= link_to 'Edit', edit_alert_path(alert) %></td>
-        <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Alert', new_alert_path %>
diff --git a/app/views/alerts/index.json.jbuilder b/app/views/alerts/index.json.jbuilder
deleted file mode 100644
index 0911a5c..0000000
--- a/app/views/alerts/index.json.jbuilder
+++ /dev/null
@@ -1,4 +0,0 @@
-json.array!(@alerts) do |alert|
-  json.extract! alert, :id, :author_id, :message
-  json.url alert_url(alert, format: :json)
-end
diff --git a/app/views/alerts/new.html.erb b/app/views/alerts/new.html.erb
deleted file mode 100644
index 6d04589..0000000
--- a/app/views/alerts/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>New alert</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', alerts_path %>
diff --git a/app/views/alerts/show.html.erb b/app/views/alerts/show.html.erb
deleted file mode 100644
index eeab7f7..0000000
--- a/app/views/alerts/show.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Author:</strong>
-  <%= @alert.author %>
-</p>
-
-<p>
-  <strong>Message:</strong>
-  <%= @alert.message %>
-</p>
-
-<%= link_to 'Edit', edit_alert_path(@alert) %> |
-<%= link_to 'Back', alerts_path %>
diff --git a/app/views/alerts/show.json.jbuilder b/app/views/alerts/show.json.jbuilder
deleted file mode 100644
index 95481eb..0000000
--- a/app/views/alerts/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.extract! @alert, :id, :author_id, :message, :created_at, :updated_at