Download as
Browse Code »

Commit d2ca549f41eed6184f02497e0cd5f642d18e58bd

Authored by Dmitriy Zaporozhets
2 parents 67bda08c 397c3da9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #3264 from yuters/patch-2 

Fix user path in markdown
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
lib/gitlab/markdown.rb
  Diff comments   View file @d2ca549
... ... @@ -17,7 +17,7 @@ module Gitlab
17 17 # Examples
18 18 #
19 19 # >> gfm("Hey @david, can you fix this?")
20   - # => "Hey <a href="/gitlab/team_members/1">@david</a>, can you fix this?"
  20 + # => "Hey <a href="/u/david">@david</a>, can you fix this?"
21 21 #
22 22 # >> gfm("Commit 35d5f7c closes #1234")
23 23 # => "Commit <a href="/gitlab/commits/35d5f7c">35d5f7c</a> closes <a href="/gitlab/issues/1234">#1234</a>"
... ... @@ -160,7 +160,7 @@ module Gitlab
160 160  
161 161 def reference_user(identifier)
162 162 if member = @project.users_projects.joins(:user).where(users: { username: identifier }).first
163   - link_to("@#{identifier}", project_team_member_url(@project, member), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member
  163 + link_to("@#{identifier}", user_path(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member
164 164 end
165 165 end
166 166  
... ...