Commit 6577d3a49cf6f21b1e044339f9cb984a67e9fdab
1 parent
fdf7fc04
Exists in
master
and in
4 other branches
Markdown now support users from groups
Showing
2 changed files
with
2 additions
and
1 deletions
Show diff stats
app/models/project.rb
| @@ -68,6 +68,7 @@ class Project < ActiveRecord::Base | @@ -68,6 +68,7 @@ class Project < ActiveRecord::Base | ||
| 68 | has_many :deploy_keys, through: :deploy_keys_projects | 68 | has_many :deploy_keys, through: :deploy_keys_projects |
| 69 | 69 | ||
| 70 | delegate :name, to: :owner, allow_nil: true, prefix: true | 70 | delegate :name, to: :owner, allow_nil: true, prefix: true |
| 71 | + delegate :members, to: :team, prefix: true | ||
| 71 | 72 | ||
| 72 | # Validations | 73 | # Validations |
| 73 | validates :creator, presence: true | 74 | validates :creator, presence: true |
lib/gitlab/markdown.rb
| @@ -166,7 +166,7 @@ module Gitlab | @@ -166,7 +166,7 @@ module Gitlab | ||
| 166 | end | 166 | end |
| 167 | 167 | ||
| 168 | def reference_user(identifier) | 168 | def reference_user(identifier) |
| 169 | - if member = @project.users_projects.joins(:user).where(users: { username: identifier }).first | 169 | + if member = @project.team_members.find { |user| user.username == identifier } |
| 170 | link_to("@#{identifier}", user_path(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member | 170 | link_to("@#{identifier}", user_path(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member |
| 171 | end | 171 | end |
| 172 | end | 172 | end |