diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 15:06:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 15:06:34 +0300 |
| commit | cd4cb29b2c304f00d238ee72fe40c767cb3e2675 (patch) | |
| tree | 4dba0f038795f8d8f43ed807a1b7f58af27b61a9 /app/services/concerns | |
| parent | 2b339d4e892045d1d7be117d1557a5394ebd6e72 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/concerns')
| -rw-r--r-- | app/services/concerns/users/participable_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/concerns/users/participable_service.rb b/app/services/concerns/users/participable_service.rb index 1c828234f1b..6fde9abfdb0 100644 --- a/app/services/concerns/users/participable_service.rb +++ b/app/services/concerns/users/participable_service.rb @@ -55,7 +55,8 @@ module Users username: group.full_path, name: group.full_name, avatar_url: group.avatar_url, - count: group_counts.fetch(group.id, 0) + count: group_counts.fetch(group.id, 0), + mentionsDisabled: group.mentions_disabled } end end |