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

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

diff --git a/app/views/messages/_heading.html.erb b/app/views/messages/_heading.html.erb
index 12c77d3f5c9ed7706b673a3719ed90e94281bd61..c3b4792021c211040e04ae95d7d5d50b72d7c9a2 100644 (file)
--- a/app/views/messages/_heading.html.erb
+++ b/app/views/messages/_heading.html.erb
@@ -3,12 +3,14 @@
 <% content_for :heading do %>
   <h1><%= t("users.show.my messages") %></h1>
   <ul class="nav nav-tabs">
-    <% { ".my_inbox" => inbox_messages_path, ".my_outbox" => outbox_messages_path }.each do |i18n_key, path| %>
+    <% { t(".my_inbox") => inbox_messages_path, t(".my_outbox") => outbox_messages_path, t(".muted_messages") => muted_messages_path }.each do |label, path| %>
+    <% next if path == muted_messages_path && current_user.muted_messages.none? %>
+
     <li class="nav-item">
       <% if path == active_link_path %>
-        <a class="nav-link active"><%= t(i18n_key) %></a>
+        <a class="nav-link active"><%= label %></a>
       <% else %>
-        <%= link_to t(i18n_key), path, :class => "nav-link" %>
+        <%= link_to label, path, :class => "nav-link" %>
       <% end %>
     </li>
     <% end %>