Merge branch 'master' into messages

[rails.git] / app / views / notes / _user.html.erb

diff --git a/app/views/notes/_user.html.erb b/app/views/notes/_user.html.erb
index 0e950765044f213282cdaa1a3fa27a6de939454f..21bab618cdd7b2e79ff21b2358585d62165b68ac 100644 (file)
--- a/app/views/notes/_user.html.erb
+++ b/app/views/notes/_user.html.erb
@@ -1 +1 @@
-<%= link_to user.display_name, :controller => "user", :action => "view", :display_name => user.display_name %>
+<%= link_to user.display_name, user_path(user) %>