You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gitea/services
Henry Goodman 12cb1d2998
Allow force push to protected branches (#28086)
Fixes #22722 

### Problem
Currently, it is not possible to force push to a branch with branch
protection rules in place. There are often times where this is necessary
(CI workflows/administrative tasks etc).

The current workaround is to rename/remove the branch protection,
perform the force push, and then reinstate the protections.

### Solution
Provide an additional section in the branch protection rules to allow
users to specify which users with push access can also force push to the
branch. The default value of the rule will be set to `Disabled`, and the
UI is intuitive and very similar to the `Push` section.

It is worth noting in this implementation that allowing force push does
not override regular push access, and both will need to be enabled for a
user to force push.

This applies to manual force push to a remote, and also in Gitea UI
updating a PR by rebase (which requires force push)

This modifies the `BranchProtection` API structs to add:
- `enable_force_push bool`
- `enable_force_push_whitelist bool`
- `force_push_whitelist_usernames string[]`
- `force_push_whitelist_teams string[]`
- `force_push_whitelist_deploy_keys bool`

### Updated Branch Protection UI:

<img width="943" alt="image"
src="https://github.com/go-gitea/gitea/assets/79623665/7491899c-d816-45d5-be84-8512abd156bf">

### Pull Request `Update branch by Rebase` option enabled with source
branch `test` being a protected branch:


![image](https://github.com/go-gitea/gitea/assets/79623665/e018e6e9-b7b2-4bd3-808e-4947d7da35cc)
<img width="1038" alt="image"
src="https://github.com/go-gitea/gitea/assets/79623665/57ead13e-9006-459f-b83c-7079e6f4c654">

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
7 months ago
..
actions Improve the handling of `jobs.<job_id>.if` (#31070) 9 months ago
agit Performance optimization for git push (#30104) 10 months ago
asymkey Fix some pending problems (#29985) 11 months ago
attachment Add support for API blob upload of release attachments (#29507) 11 months ago
auth Fix tautological conditions (#30735) 9 months ago
automerge Fix automerge will not work because of some events haven't been triggered (#30780) 9 months ago
context Refactor names (#31405) 8 months ago
contexttest Check if reverse proxy is correctly configured (#30890) 9 months ago
convert Allow force push to protected branches (#28086) 7 months ago
cron Move some asymkey functions to service layer (#28894) 11 months ago
doctor Resolve lint for unused parameter and unnecessary type arguments (#30750) 9 months ago
externalaccount [Fix] Account Linking UpdateMigrationsByType (#31428) 8 months ago
feed More `db.DefaultContext` refactor (#27265) 1 year ago
forms Allow force push to protected branches (#28086) 7 months ago
gitdiff Update golangci-lint to v1.59.0 (#31221) 8 months ago
indexer Update issue indexer after merging a PR (#30715) 9 months ago
issue Performance improvements for pull request list API (#30490) 8 months ago
lfs Refactor names (#31405) 8 months ago
mailer Add option for mailer to override mail headers (#27860) 8 months ago
markup Enable more `revive` linter rules (#30608) 10 months ago
migrations Add `lint-go-gopls` (#30729) 8 months ago
mirror Resolve lint for unused parameter and unnecessary type arguments (#30750) 9 months ago
notify Clean up log messages (#30313) 10 months ago
org Update misspell to 0.5.1 and add `misspellings.csv` (#30573) 10 months ago
packages remove util.OptionalBool and related functions (#29513) 11 months ago
pull Allow force push to protected branches (#28086) 7 months ago
release Check if the release is converted from the tag when updating the release (#30984) 9 months ago
repository Refactor names (#31405) 8 months ago
secrets Refactor deletion (#28610) 1 year ago
task Fix "force private" logic (#31012) 9 months ago
uinotification Penultimate round of `db.DefaultContext` refactor (#27414) 1 year ago
user Fix bug on avatar (#31008) 9 months ago
webhook Enable `unparam` linter (#31277) 8 months ago
webtheme Initial support for colorblindness-friendly themes (#30625) 10 months ago
wiki Refactor names (#31405) 8 months ago