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-11 20:44:16 +0300 |
| commit | 8b3ada75b04ee77571464c2550540623a89c338f (patch) | |
| tree | e6e5e61d284cc5b30ab8bab54b77a692d72ba112 | |
| parent | d422ee0f112d182d85c0540c64b9f749e040a091 (diff) | |
| download | gitlab-ce-8b3ada75b04ee77571464c2550540623a89c338f.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 f22070f8504..67ad02e8048 100644 --- a/app/models/concerns/mentionable.rb +++ b/app/models/concerns/mentionable.rb @@ -15,7 +15,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 |