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

[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 f9eb01a6d69948d8911dec99cae609ff3b582af2..b114539589c75abe3f1245c06c64a15bd35bd968 100644 (file)
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -1,6 +1,6 @@
 <% content_for :auto_discovery_link_tag do -%>
   <% unless params[:friends] or params[:nearby] -%>
 <% content_for :auto_discovery_link_tag do -%>
   <% unless params[:friends] or params[:nearby] -%>

-    <%= auto_discovery_link_tag :atom, @params.merge(:max_id => nil, :xhr => nil, :action => :feed) %>
+    <%= auto_discovery_link_tag :atom, @params.to_h.merge(:max_id => nil, :xhr => nil, :action => :feed) %>

   <% end -%>
 <% end -%>
 
   <% end -%>
 <% end -%>
 


@@ -13,6 +13,10 @@
 
 <%= render "sidebar_header", :title => @heading %>
 
 
 <%= render "sidebar_header", :title => @heading %>
 

-<div class="changesets">
-  <%= image_tag "searching.gif", :class => "loader" %>
+<div class="changesets mx-n3">
+  <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>