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

diff --combined 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
@@@ -15,6 -15,7 +15,7 @@@
            <th><%= t ".reported_user" %></th>
            <th class="reporting_users"><%= t ".reporting_users" %></th>
            <th><%= t ".last_updated" %></th>
+           <th><%= t ".last_managed" %></th>
          </tr>
        </thead>
        <tbody>
@@@ -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 --combined config/locales/en.yml
index 5cfb56062e349f81712a7732e5d860e0dc04c168,064020397b8a7142051c4fa9ac6d80d7ba84f01b..b73be94ad4c3ac0c86fbbce3c85ec8db663133bd
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -476,6 -476,8 +476,6 @@@ en
          sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
    changesets:
      changeset:
 -      no_edits: "(no edits)"
 -      view_changeset_details: "View changeset details"
        comments:
          one: "%{count} comment"
          other: "%{count} comments"
@@@ -551,8 -553,6 +551,8 @@@
        km away: "%{count}km away"
        m away: "%{count}m away"
        latest_edit_html: "Latest edit (%{ago}):"
 +      no_edits: "(no edits)"
 +      view_changeset_details: "View changeset details"
      popup:
        your location: "Your location"
        nearby mapper: "Nearby mapper"
@@@ -1517,9 -1517,9 +1517,9 @@@
        title: Issues
        select_status: Select Status
        select_type: Select Type
-       select_last_updated_by: Select Last Updated By
+       select_last_managed_by: Select Last Managed By
        reported_user: Reported User
-       not_updated: Not Updated
+       not_managed: Not Managed
        search: Search
        search_guidance: "Search Issues:"
        states:
@@@ -1533,11 -1533,12 +1533,11 @@@
        status: Status
        reports: Reports
        last_updated: Last Updated
-       last_updated_time_ago_user_html: "%{time_ago} by %{user}"
+       last_managed: Last Managed
        reporting_users: Reporting Users
        reports_count:
          one: "%{count} Report"
          other: "%{count} Reports"
 -      more_reporters: "and %{count} more"
        reported_item: Reported Item
        states:
          ignored: Ignored
@@@ -1580,11 -1581,6 +1580,11 @@@
        reportable_title:
          diary_comment: "%{entry_title}, comment #%{comment_id}"
          note: "Note #%{note_id}"
 +    reporters:
 +      index:
 +        title: "Issue #%{issue_id} Reporters"
 +      reporters:
 +        more_reporters: "and %{count} more"
    issue_comments:
      create:
        comment_created: Your comment was successfully created