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

diff --combined app/views/changesets/history.html.erb
index b114539589c75abe3f1245c06c64a15bd35bd968,339d60e98845f96f3b0b3bb61c7df090de056d6d..a9970e652dae24da2542bf32fddfc9e15a2f9035
--- 1/app/views/changesets/history.html.erb
--- 2/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>