diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-04 16:53:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-04 16:53:44 +0000 |
commit | 4e3a54f835daa49bf784d6e6ad91e90116a24dc8 (patch) | |
tree | 8e1f7be7a80da2de02b2da0ed88f81b2f6b6de8c /app/services | |
parent | aefe6486cf0d193067112b90145083d73b96bfef (diff) | |
download | gitlab-ce-4e3a54f835daa49bf784d6e6ad91e90116a24dc8.tar.gz |
Add latest changes from gitlab-org/security/gitlab@13-6-stable-ee
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/todos/destroy/entity_leave_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/todos/destroy/entity_leave_service.rb b/app/services/todos/destroy/entity_leave_service.rb index 97c56b84434..7cfedc2233a 100644 --- a/app/services/todos/destroy/entity_leave_service.rb +++ b/app/services/todos/destroy/entity_leave_service.rb @@ -22,7 +22,7 @@ module Todos # if at least reporter, all entities including confidential issues can be accessed return if user_has_reporter_access? - remove_confidential_issue_todos + remove_confidential_resource_todos if entity.private? remove_project_todos @@ -40,7 +40,7 @@ module Todos end end - def remove_confidential_issue_todos + def remove_confidential_resource_todos Todo .for_target(confidential_issues.select(:id)) .for_type(Issue.name) @@ -133,3 +133,5 @@ module Todos end end end + +Todos::Destroy::EntityLeaveService.prepend_if_ee('EE::Todos::Destroy::EntityLeaveService') |