diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 21:11:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-28 21:11:01 +0300 |
| commit | 7c5f1bfac791045e54386b9c9bb56ee24afc68ca (patch) | |
| tree | a11c8dff3994899c25acacb383c0a70522a24cd1 /app/services/todos | |
| parent | d62fd6e04c272d48dccde4033529ca97c27502f6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/todos')
| -rw-r--r-- | app/services/todos/destroy/group_private_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/todos/destroy/group_private_service.rb b/app/services/todos/destroy/group_private_service.rb index d7ecbb952aa..60599ca9ca4 100644 --- a/app/services/todos/destroy/group_private_service.rb +++ b/app/services/todos/destroy/group_private_service.rb @@ -24,7 +24,10 @@ module Todos override :authorized_users def authorized_users - group.direct_and_indirect_users.select(:id) + User.from_union([ + group.project_users_with_descendants.select(:id), + group.members_with_parents.select(:user_id) + ], remove_duplicates: false) end override :todos_to_remove? |