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

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

diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb
index 17faf7f8d8e80956d8ba655b2cdf7b367460801b..ba745cb032489d833ddcf36b997fb6b3c0a49b0f 100644 (file)
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@ -5,9 +5,9 @@
 <% end -%>
 
 <%
 <% end -%>
 
 <%

-   set_title(changeset_list_title(params, current_user))
+   set_title(changeset_index_title(params, current_user))

    if params[:display_name]
    if params[:display_name]

-     @heading = t('changeset.list.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
    else
      @heading = @title
    end