Merge remote-tracking branch 'upstream/pull/5575'

[rails.git] / app / views / messages / inbox.html.erb

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
deleted file mode 100644 (file)
index db807d2..0000000
--- a/app/views/messages/inbox.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "messages" %>
-<% end %>
-
-<%= render :partial => "heading", :locals => { :active_link_path => inbox_messages_path } %>
-
-<h4><%= render :partial => "message_count" %></h4>
-
-<% if current_user.messages.size > 0 %>
-  <%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.messages, :inner_partial => "message_summary" } %>
-<% else %>
-  <div><%= t(".no_messages_yet_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %></div>
-<% end %>