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

[rails.git] / app / views / issues / _comments.html.erb

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index 046e80163c98001c4abe03675399eaf7d5aa73f2..9200b4cec6246b8feebcc7dbaab1eee77fe19a43 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -2,14 +2,15 @@
   <% comments.each do |comment| %>
     <div class="row">
       <div class="col-auto">
-        <%= link_to user_thumbnail(comment.user, :class => "user_image_no_margins"), user_path(comment.user) %>
+        <%= link_to user_thumbnail(comment.user), comment.user %>
       </div>
       <div class="col">
-        <p class="text-muted mb-0">
-          <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
-                                      :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
+        <p class="text-muted">
+          <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, comment.user),
+                                      :comment_created_at => tag.time(l(comment.created_at.to_datetime, :format => :friendly),
+                                                                      :datetime => comment.created_at.xmlschema) %>
         </p>
-        <p><%= comment.body %></p>
+        <div class="richtext text-break"><%= comment.body.to_html %></div>
       </div>
     </div>
     <hr>