Merge remote-tracking branch 'upstream/pull/1974'
authorTom Hughes <tom@compton.nu>
Wed, 5 Sep 2018 18:06:16 +0000 (19:06 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 5 Sep 2018 18:06:16 +0000 (19:06 +0100)
1  2 
app/views/changeset/history.html.erb
app/views/changeset/index.atom.builder
app/views/user/show.html.erb
config/locales/en.yml
config/routes.rb

@@@ -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
Simple merge
Simple merge
Simple merge