Commit 0e885485 authored by Timothy Andrew's avatar Timothy Andrew

Fix incorrect merge conflict resolution in `ProtectedBranches::ApiUpdateService`

We have separate methods to delete redundant CE/EE access levels. So,
either `delete_redundant_access_levels` or
`delete_redundant_ee_access_levels` needs to be called, not both (as was
the case here).
parent a11dd013
...@@ -11,7 +11,6 @@ module ProtectedBranches ...@@ -11,7 +11,6 @@ module ProtectedBranches
@protected_branch = protected_branch @protected_branch = protected_branch
protected_branch.transaction do protected_branch.transaction do
delete_redundant_access_levels
delete_redundant_ee_access_levels delete_redundant_ee_access_levels
case @developers_can_push case @developers_can_push
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment