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

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

diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 143f2d887106cb996406f62358b4d4e8f3429465..9ef28f1c29007c06664aed58894350b90fcc0081 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,14 +1,17 @@
 <% reports.each do |report| %>
 <% reports.each do |report| %>

-  <div class="report">
-    <div class="float-left">
+  <div class="row">
+    <div class="col-auto">

       <%= link_to user_thumbnail(report.user), user_path(report.user) %>
     </div>
       <%= link_to user_thumbnail(report.user), user_path(report.user) %>
     </div>

-    <p class="text-muted mb-0">
-      <%= t ".reported_by_html", :category => report.category,
-                                 :user => link_to(report.user.display_name, user_path(report.user)),
-                                 :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
-    </p>
-    <p><%= report.details %></p>
+    <div class="col">
+      <p class="text-muted">
+        <%= t ".reported_by_html", :category => report.category,
+                                   :user => link_to(report.user.display_name, user_path(report.user)),
+                                   :updated_at => tag.time(l(report.updated_at.to_datetime, :format => :friendly),
+                                                           :datetime => report.updated_at.xmlschema) %>
+      </p>
+      <div class="richtext text-break"><%= report.details.to_html %></div>
+    </div>

   </div>
   <hr>
 <% end %>
   </div>
   <hr>
 <% end %>