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

diff --cc app/views/issues/_page.html.erb
index 225517c9dadd0a2e14d9f7dc478728320f08fa85,a1279cb9703178f13cc4706898d7a967b77fc595..d42d6238dd16f5dbea28858735f897b44fed2f8b
--- 1/app/views/issues/_page.html.erb
--- 2/app/views/issues/_page.html.erb
+++ b/app/views/issues/_page.html.erb
@@@ -25,15 -26,18 +26,13 @@@
              <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">
 -              <% @unique_reporters[issue.id][:users].each do |reporter| %>
 -                <%= link_to reporter.display_name, reporter, :class => "d-block text-truncate", :title => reporter.display_name %>
 -              <% end %>
 -              <% if @unique_reporters[issue.id][:count] > 3 %>
 -                <p class="m-0"><%= t ".more_reporters", :count => @unique_reporters[issue.id][:count] - 3 %></p>
 -              <% end %>
 +              <%= 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),
-                                                           :time_ago => friendly_date_ago(issue.updated_at) %>
-               <% else %>
-                 <%= friendly_date_ago(issue.updated_at) %>
-               <% end %>
+               <%= friendly_date_ago(issue.updated_at) %>
+             </td>
+             <td>
+               <%= link_to(issue.user_updated.display_name, issue.user_updated) if issue.user_updated %>
              </td>
            </tr>
          <% end %>

diff --cc config/locales/en.yml
Simple merge