Skip to content

Revert "Merge branch 'id-restrict-protected-rules' into 'master'"

Nick Thomas requested to merge revert-04013f09 into master

What does this MR do?

!52319 (merged) changed the logic for protected branch rules, trying to solve a problem where, if there were two rules with exactly the same specificity (e.g. two rules for feature/*, one specifying developers can merge and another specifying only maintainers can, then developers can merge, contrary to expectations).

However, this had an unintended effect: now, if two rules exist with different specificities, e.g., foo/* and foo/bar/*, then the most permissive of those two win, whereas previously the more specific rule, foo/bar/*, would override the one for foo/*.

Reverting so we can consider how to approach this in a considered way, since the two-rules-with-the-same-specificity situation is an edge case that can be resolved by a project owner removing the rule they don't want, while there's no reasonable workaround for the functionality that was broken by the change.

Screenshots (strongly suggested)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

#321658 (closed)

#321564 (closed)

Edited by Mayra Cabrera

Merge request reports

Loading