Relax strict version constraint on rails gem

[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 f27aacb8cd96a8a31b651afba07eaad4b06718db..b601057f6f1280ba780a15bb67271268e77cd51b 100644 (file)
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -1,23 +1,18 @@
 <% 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 -%>
 

-<%
-   set_title(changeset_index_title(params, current_user))
-   if params[:display_name]
-     @heading = t("changesets.index.title_user", :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
-   else
-     @heading = @title
-   end
-%>
+<% 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
+              else
+                @title
+              end %>

 
 

-<h2>
-  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <%= @heading %>
-</h2>
+<%= render "sidebar_header", :title => @heading %>

 
 

-<div class="changesets">
+<div class="changesets mx-n3">

   <%= image_tag "searching.gif", :class => "loader" %>
 </div>
   <%= image_tag "searching.gif", :class => "loader" %>
 </div>