Skip to content

Commit 8a038b6

Browse files
committed
Allow repository maintainers to force-merge
The repository ruleset `Protect version branches` has been updated to allow repository maintainers to skip protection rules in PRs. Signed-off-by: Leandro Lucarella <[email protected]>
1 parent e1c7147 commit 8a038b6

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

RELEASE_NOTES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,20 @@ To upgrade without regenerating the project, you can follow these steps:
1818
sed '/ # Checked by flake8/a\ "redefined-outer-name",\n "unused-import",' pyproject.toml
1919
```
2020

21+
- It is recommended to update this rule in your repository to use the new bypass rule for the `Protect version branches` ruleset that allows maintainers to force-merge.
22+
23+
You can do this by re-importing the ruleset or manually:
24+
25+
Go to the repository settings -> **Rules** -> **Rulesets** -> **Protect version branches** -> **Bypass list** -> **Add bypass** -> Select **Maintain** role and change the dropdown bypass rule to use **Pull requests** instead of **Always**.
26+
2127
## New Features
2228

2329
<!-- Here goes the main new features and examples or instructions on how to use them -->
2430

2531
### Cookiecutter template
2632

2733
- Some checks that are already performed by `flake8` are now disabled in `pylint` to avoid double reporting.
34+
- The repository ruleset `Protect version branches` has been updated to allow repository maintainers to skip protection rules in PRs.
2835

2936
## Bug Fixes
3037

github-rulesets/Protect version branches.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@
7070
}
7171
],
7272
"bypass_actors": [
73+
{
74+
"actor_id": 2,
75+
"actor_type": "RepositoryRole",
76+
"bypass_mode": "pull_request"
77+
},
7378
{
7479
"actor_id": 5,
7580
"actor_type": "RepositoryRole",

0 commit comments

Comments
 (0)