summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-20 00:32:45 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-20 00:32:45 -0700
commitd2ca549f41eed6184f02497e0cd5f642d18e58bd (patch)
tree98ae1ed81954666d3ca5edd6869a9c9398a2169d
parent67bda08cbe807c4a789e5e35c8cd0b795fa6b787 (diff)
parent397c3da9758c03a215a308c011f94261d9c61cfa (diff)
downloadgitlab-ce-d2ca549f41eed6184f02497e0cd5f642d18e58bd.tar.gz
Merge pull request #3264 from yuters/patch-2
Fix user path in markdown
-rw-r--r--lib/gitlab/markdown.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 280f9f9730a..762eb372980 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -17,7 +17,7 @@ module Gitlab
# Examples
#
# >> gfm("Hey @david, can you fix this?")
- # => "Hey <a href="/gitlab/team_members/1">@david</a>, can you fix this?"
+ # => "Hey <a href="/u/david">@david</a>, can you fix this?"
#
# >> gfm("Commit 35d5f7c closes #1234")
# => "Commit <a href="/gitlab/commits/35d5f7c">35d5f7c</a> closes <a href="/gitlab/issues/1234">#1234</a>"
@@ -160,7 +160,7 @@ module Gitlab
def reference_user(identifier)
if member = @project.users_projects.joins(:user).where(users: { username: identifier }).first
- link_to("@#{identifier}", project_team_member_url(@project, member), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member
+ link_to("@#{identifier}", user_path(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member
end
end