Merge branch 'master' into next

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

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index 56ed53c6de63196e0b59c8f4b7cde49ab4590dc6..03e01915eae205067a106787e63a3fbd43dd6b1a 100644 (file)
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -1,5 +1,9 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "messages" %>
+<% end %>
+
 <% content_for :heading do %>
-  <h2><%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_path(current_user.display_name) %></h2>
+  <h2><%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_messages_path %></h2>
 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>