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

[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 e55bf42578fb5200ccf94040f02113b32fd7599c..f828e5a4350b4a80bb64306190aa85ecc4cd18bd 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">
   <% comments.each do |comment| %>
     <div class="row">
       <div class="col-auto">

-        <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
+        <%= link_to user_thumbnail(comment.user), comment.user %>

       </div>
       <div class="col">
       </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-body-secondary">
+          <%= 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>

-        <p><%= comment.body %></p>
+        <div class="richtext text-break"><%= comment.body.to_html %></div>

       </div>
     </div>
     <hr>
       </div>
     </div>
     <hr>