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

[rails.git] / app / views / changeset / _changeset.html.erb

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index 5c5ad670b6c91d4c8cc484dfb51f009723a4efe9..03ba013a32df307f31ac7b4cb4bab182661f5168 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -14,14 +14,14 @@
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
   <h4>
-    <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
-      <% if changeset.tags['comment'].to_s != '' %>
-        <%= linkify(h(changeset.tags['comment'])) %>
-      <% else %>
-        <%= t 'browse.no_comment' %>
-      <% end %>
+    <a class="changeset_id" href="<%= changeset_path(changeset) %>">
+      <%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
     </a>
   </h4>
+  <div class="comments comments-<%= changeset.comments.length %>">
+    <%= changeset.comments.length %>
+    <span class="icon note grey"></span>
+  </div>
   <div class="details">
     <%= changeset_details(changeset) %>
     &middot;