From: Tom Hughes <tom@compton.nu>
Date: Sat, 8 Mar 2025 11:00:15 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5763'
X-Git-Tag: live~32
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/09d31dc6be38d0bbd7cb0531b2596d20bfa78dc4?ds=inline;hp=--cc

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

09d31dc6be38d0bbd7cb0531b2596d20bfa78dc4
diff --cc app/views/issues/_page.html.erb
index 225517c9d,a1279cb97..d42d6238d
--- a/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 %>