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

[rails.git] / app / views / trace / _trace.html.erb

diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index 0fecd8f9910625e9fceefcf648d2e0d5871b5728..ecadacc64942fbe099b55c657950144c3d6b4e2e 100644 (file)
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -21,7 +21,7 @@
       <br />
       <%= trace.description %>
     <br />
       <br />
       <%= trace.description %>
     <br />

-    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
+    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %>

     <% if !trace.tags.empty? %>
       <%= t'trace.trace.in' %>
       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
     <% if !trace.tags.empty? %>
       <%= t'trace.trace.in' %>
       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>