diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-04 17:05:48 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-04 17:05:48 +0300 |
| commit | 626359831402aeede4c4cb12cb10c7534a0dae79 (patch) | |
| tree | 9a9f896a5101e2968a5b83e1c2f8b5b4df4fc8c9 | |
| parent | a8cb13c85dec55600e8d75fce6aa6c87d47eb2ac (diff) | |
| download | gitlab-ce-626359831402aeede4c4cb12cb10c7534a0dae79.tar.gz | |
Respect group members in mentionable concern
| -rw-r--r-- | app/models/concerns/mentionable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb index 27e39339ae8..5858fe1bb6f 100644 --- a/app/models/concerns/mentionable.rb +++ b/app/models/concerns/mentionable.rb @@ -50,7 +50,7 @@ module Mentionable matches.each do |match| identifier = match.delete "@" if has_project - id = project.users_projects.joins(:user).where(users: { username: identifier }).pluck(:user_id).first + id = project.team.members.find { |u| u.username == identifier }.try(:id) else id = User.where(username: identifier).pluck(:id).first end |