deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3264 from yuters/patch-2

Browse source 
Fix user path in markdown
This commit is contained in:
Dmitriy Zaporozhets 2013-03-20 00:32:45 -07:00
parent 67bda08cbe 397c3da975
commit d2ca549f41
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/markdown.rb
View file

@ -17,7 +17,7 @@ module Gitlab
# Examples # Examples
# #
# >> gfm("Hey @david, can you fix this?") # >> 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") # >> gfm("Commit 35d5f7c closes #1234")
# => "Commit <a href="/gitlab/commits/35d5f7c">35d5f7c</a> closes <a href="/gitlab/issues/1234">#1234</a>" # => "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) def reference_user(identifier)
if member = @project.users_projects.joins(:user).where(users: { username: identifier }).first 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
end end