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

[rails.git] / app / views / changesets / history.html.erb

diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb
index b601057f6f1280ba780a15bb67271268e77cd51b..a536677b08b727fc304414ba8b5571c29e2618b7 100644 (file)
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -6,7 +6,7 @@
 
 <% set_title(changeset_index_title(params, current_user))
    @heading = if params[:display_name]
 
 <% 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(params[:display_name])))

               else
                 @title
               end %>
               else
                 @title
               end %>


@@ -14,5 +14,9 @@
 <%= render "sidebar_header", :title => @heading %>
 
 <div class="changesets mx-n3">
 <%= 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>
 </div>