diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/services/protected_branches | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/services/protected_branches')
-rw-r--r-- | app/services/protected_branches/legacy_api_update_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/protected_branches/legacy_api_update_service.rb b/app/services/protected_branches/legacy_api_update_service.rb index 65dc3297ae8..0cad23f20f7 100644 --- a/app/services/protected_branches/legacy_api_update_service.rb +++ b/app/services/protected_branches/legacy_api_update_service.rb @@ -39,11 +39,11 @@ module ProtectedBranches def delete_redundant_access_levels unless developers_can_merge.nil? - protected_branch.merge_access_levels.destroy_all # rubocop: disable DestroyAll + protected_branch.merge_access_levels.destroy_all # rubocop: disable Cop/DestroyAll end unless developers_can_push.nil? - protected_branch.push_access_levels.destroy_all # rubocop: disable DestroyAll + protected_branch.push_access_levels.destroy_all # rubocop: disable Cop/DestroyAll end end end |