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

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

diff --git a/app/views/issues/_page.html.erb b/app/views/issues/_page.html.erb
index f625f0e0434ece3dcf3e8f244f65cfd50e6c30ab..225517c9dadd0a2e14d9f7dc478728320f08fa85 100644 (file)
--- a/app/views/issues/_page.html.erb
+++ b/app/views/issues/_page.html.erb
@@ -13,6 +13,7 @@
           <th><%= t ".reports" %></th>
           <th><%= t ".reported_item" %></th>
           <th><%= t ".reported_user" %></th>
+          <th class="reporting_users"><%= t ".reporting_users" %></th>
           <th><%= t ".last_updated" %></th>
         </tr>
       </thead>
@@ -23,6 +24,9 @@
             <td class="text-nowrap"><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
             <td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
             <td><%= link_to issue.reported_user.display_name, issue.reported_user if issue.reported_user %></td>
+            <td class="reporting_users text-truncate">
+              <%= render :partial => "issues/reporters/reporters", :locals => { :issue => issue } %>
+            </td>
             <td>
               <% if issue.user_updated %>
                 <%= t ".last_updated_time_ago_user_html", :user => link_to(issue.user_updated.display_name, issue.user_updated),