diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-06 16:45:37 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-06 16:45:37 -0800 |
| commit | 89f8020fe12e16faf125a193b25a0eeaea3b49c0 (patch) | |
| tree | b176949c60b4bd25e36b70a96f5dfc6cdcf4f0ef /app/models/concerns | |
| parent | 8c4b98bec79e02613924db853deadd5af4ff0e15 (diff) | |
| parent | 04a70d9ff7c8132bfd01ebf4d10fd34745719833 (diff) | |
| download | gitlab-ce-89f8020fe12e16faf125a193b25a0eeaea3b49c0.tar.gz | |
Merge branch 'mention-groups'
Conflicts:
CHANGELOG
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/mentionable.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb index 66f83b932d4..d640728519a 100644 --- a/app/models/concerns/mentionable.rb +++ b/app/models/concerns/mentionable.rb @@ -51,9 +51,12 @@ module Mentionable identifier = match.delete "@" if identifier == "all" users.push(*project.team.members.flatten) - else - id = User.find_by(username: identifier).try(:id) - users << User.find(id) unless id.blank? + elsif namespace = Namespace.find_by(path: identifier) + if namespace.type == "Group" + users.push(*namespace.users) + else + users << namespace.owner + end end end users.uniq |