From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Sep 2018 18:06:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1974'
X-Git-Tag: live~2953
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/983e21db2e3ccc5f645f40a5f076d35e2b7897c2?ds=sidebyside

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

983e21db2e3ccc5f645f40a5f076d35e2b7897c2
diff --cc app/views/changeset/history.html.erb
index ec3adcb02,bd8c24703..ba745cb03
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@@ -5,9 -5,9 +5,9 @@@
  <% end -%>
  
  <%
-    set_title(changeset_list_title(params, current_user))
+    set_title(changeset_index_title(params, current_user))
     if params[:display_name]
-      @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
 -     @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe
++     @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
     else
       @heading = @title
     end