From: Tom Hughes <tom@compton.nu>
Date: Thu, 17 Nov 2022 17:49:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3803'
X-Git-Tag: live~1497
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c0278a01da05d8af7c4aec9eeab37a47f1d3110f?hp=-c

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

c0278a01da05d8af7c4aec9eeab37a47f1d3110f
diff --combined app/views/changesets/history.html.erb
index b11453958,339d60e98..a9970e652
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@@ -6,7 -6,7 +6,7 @@@
  
  <% set_title(changeset_index_title(params, current_user))
     @heading = if params[:display_name]
-                 t("changesets.index.title_user", :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
+                 t("changesets.index.title_user_link_html", :user_link => link_to(params[:display_name], user_path(:display_name => params[:display_name])))
                else
                  @title
                end %>
@@@ -14,9 -14,5 +14,9 @@@
  <%= render "sidebar_header", :title => @heading %>
  
  <div class="changesets mx-n3">
 -  <%= image_tag "searching.gif", :class => "loader" %>
 +  <div class="text-center loader">
 +    <div class="spinner-border" role="status">
 +      <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
 +    </div>
 +  </div>
  </div>