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

[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 6a90dbbff49c0bf1841c93e6848155f31b22d573..9c5695e0a88558c794a21ce94bb01aefb05e392a 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,14 +1,16 @@
 <div>
   <% comments.each do |comment| %>
-    <div class="comment">
-      <div class="float-left">
+    <div class="row">
+      <div class="col-auto">
         <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
       </div>
-      <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>
-      <p><%= comment.body %></p>
+      <div class="col">
+        <p class="text-muted">
+          <%= 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>
+        <div class="richtext text-break"><%= comment.body.to_html %></div>
+      </div>
     </div>
     <hr>
   <% end %>