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

[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 b1b690f8c965ec5d93c5113b03498181e3aba2dc..2d0f1650bdf4f3c2040c0c8c09086f7641ef7f92 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -1,15 +1,16 @@
 <% reports.each do |report| %>
   <div class="row">
     <div class="col-auto">
 <% reports.each do |report| %>
   <div class="row">
     <div class="col-auto">

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

     </div>
     <div class="col">
     </div>
     <div class="col">

-      <p class="text-muted mb-0">
+      <p class="text-body-secondary">

         <%= t ".reported_by_html", :category => report.category,
         <%= 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) %>
+                                   :user => link_to(report.user.display_name, report.user),
+                                   :updated_at => tag.time(l(report.updated_at.to_datetime, :format => :friendly),
+                                                           :datetime => report.updated_at.xmlschema) %>

       </p>
       </p>

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

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