This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/main by this push:
new fafea56ca chore(asf.yaml): added branch protection bypass for release
managers … (#2773)
fafea56ca is described below
commit fafea56ca6fc757617650b2b0c4357c7e90dbfde
Author: Lenny Primak <[email protected]>
AuthorDate: Tue Jun 16 12:09:44 2026 -0400
chore(asf.yaml): added branch protection bypass for release managers …
(#2773)
* chore(asf.yaml): added branch protection bypass for release managers
team, enabled non-linear history (merge commits)
* correct merge buttons are now enabled
---
.asf.yaml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 678955ec0..02b97a57d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -29,8 +29,8 @@ github:
discussions: true
enabled_merge_buttons:
squash: true
- merge: true
- rebase: false
+ merge: false
+ rebase: true
rulesets:
- name: "Branch Protection"
type: branch
@@ -41,6 +41,8 @@ github:
- "1.13.x"
- "release/*"
excludes: []
+ bypass_teams:
+ - "release-managers"
restrict_deletion: true
restrict_force_push: true
required_signatures: false
