From 7c5f1bfac791045e54386b9c9bb56ee24afc68ca Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 28 Jul 2023 18:11:01 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/todos/destroy/group_private_service.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/services/todos') 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? -- cgit v1.2.3