summaryrefslogtreecommitdiff
path: root/app/models/concerns/participable.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-05-07 08:26:44 +0000
committerDouwe Maan <douwe@gitlab.com>2018-05-07 08:26:44 +0000
commit67c9f822dd60ef55323082cd0b17ccd6108a24c6 (patch)
tree716d434e45d4b43161e889d99c37b31415e22049 /app/models/concerns/participable.rb
parent6a052a14e938ef073977afd808dd12a801f44369 (diff)
parentcfa92112d189dce1028bce7145a5cbe609c389a8 (diff)
downloadgitlab-ce-67c9f822dd60ef55323082cd0b17ccd6108a24c6.tar.gz
Merge branch '4084-epics-username-autocomplete-ce' into 'master'
Backport CE changes from "autocomplete usernames in Epic comments/description" See merge request gitlab-org/gitlab-ce!18605
Diffstat (limited to 'app/models/concerns/participable.rb')
-rw-r--r--app/models/concerns/participable.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb
index e48bc0be410..01b1ef9f82c 100644
--- a/app/models/concerns/participable.rb
+++ b/app/models/concerns/participable.rb
@@ -98,6 +98,10 @@ module Participable
participants.merge(ext.users)
+ filter_by_ability(participants)
+ end
+
+ def filter_by_ability(participants)
case self
when PersonalSnippet
Ability.users_that_can_read_personal_snippet(participants.to_a, self)