diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 12:06:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 12:06:34 +0000 |
| commit | cd4cb29b2c304f00d238ee72fe40c767cb3e2675 (patch) | |
| tree | 4dba0f038795f8d8f43ed807a1b7f58af27b61a9 /lib/banzai/reference_parser | |
| parent | 2b339d4e892045d1d7be117d1557a5394ebd6e72 (diff) | |
| download | gitlab-ce-cd4cb29b2c304f00d238ee72fe40c767cb3e2675.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai/reference_parser')
| -rw-r--r-- | lib/banzai/reference_parser/user_parser.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/banzai/reference_parser/user_parser.rb b/lib/banzai/reference_parser/user_parser.rb index 067b06b7590..36c41c6615f 100644 --- a/lib/banzai/reference_parser/user_parser.rb +++ b/lib/banzai/reference_parser/user_parser.rb @@ -97,7 +97,9 @@ module Banzai def find_users_for_groups(ids) return [] if ids.empty? - User.joins(:group_members).where(members: { source_id: ids }).to_a + User.joins(:group_members).where(members: { + source_id: Namespace.where(id: ids).where('mentions_disabled IS NOT TRUE').select(:id) + }).to_a end def find_users_for_projects(ids) |