0
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-14 05:24:03 +01:00
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>
2024-07-05 18:21:56 +00:00
..
actions Improve the handling of jobs.<job_id>.if (#31070) 2024-05-27 14:15:34 +08:00
agit Performance optimization for git push (#30104) 2024-04-09 03:43:17 +00:00
asymkey Fix some pending problems (#29985) 2024-03-22 19:17:30 +08:00
attachment Add support for API blob upload of release attachments (#29507) 2024-03-02 17:02:01 +00:00
auth Fix tautological conditions (#30735) 2024-04-30 14:34:40 +02:00
automerge Fix automerge will not work because of some events haven't been triggered (#30780) 2024-05-21 23:23:22 +08:00
context Refactor names (#31405) 2024-06-19 06:32:45 +08:00
contexttest Check if reverse proxy is correctly configured (#30890) 2024-05-10 20:07:01 +08:00
convert Allow force push to protected branches (#28086) 2024-07-05 18:21:56 +00:00
cron Move some asymkey functions to service layer (#28894) 2024-03-04 08:57:39 +00:00
doctor Resolve lint for unused parameter and unnecessary type arguments (#30750) 2024-04-29 08:47:56 +00:00
externalaccount [Fix] Account Linking UpdateMigrationsByType (#31428) 2024-06-20 21:24:53 +08:00
feed More db.DefaultContext refactor (#27265) 2023-09-29 12:12:54 +00:00
forms Allow force push to protected branches (#28086) 2024-07-05 18:21:56 +00:00
gitdiff Update golangci-lint to v1.59.0 (#31221) 2024-06-03 07:04:35 +00:00
indexer Update issue indexer after merging a PR (#30715) 2024-05-08 14:45:15 +00:00
issue Performance improvements for pull request list API (#30490) 2024-05-31 12:10:11 +00:00
lfs Refactor names (#31405) 2024-06-19 06:32:45 +08:00
mailer Add option for mailer to override mail headers (#27860) 2024-06-03 20:42:52 +02:00
markup Enable more revive linter rules (#30608) 2024-04-22 11:48:42 +00:00
migrations Add lint-go-gopls (#30729) 2024-06-05 09:22:38 +08:00
mirror Resolve lint for unused parameter and unnecessary type arguments (#30750) 2024-04-29 08:47:56 +00:00
notify Clean up log messages (#30313) 2024-04-07 19:17:06 +08:00
org Update misspell to 0.5.1 and add misspellings.csv (#30573) 2024-04-27 08:03:49 +00:00
packages remove util.OptionalBool and related functions (#29513) 2024-03-02 16:42:31 +01:00
pull Allow force push to protected branches (#28086) 2024-07-05 18:21:56 +00:00
release Check if the release is converted from the tag when updating the release (#30984) 2024-05-15 14:25:47 +00:00
repository Refactor names (#31405) 2024-06-19 06:32:45 +08:00
secrets Refactor deletion (#28610) 2023-12-25 21:25:29 +01:00
task Fix "force private" logic (#31012) 2024-05-20 00:56:45 +00:00
uinotification Penultimate round of db.DefaultContext refactor (#27414) 2023-10-11 04:24:07 +00:00
user Fix bug on avatar (#31008) 2024-05-19 12:58:39 +08:00
webhook Enable unparam linter (#31277) 2024-06-11 18:47:45 +00:00
webtheme Initial support for colorblindness-friendly themes (#30625) 2024-04-24 00:18:41 +08:00
wiki Refactor names (#31405) 2024-06-19 06:32:45 +08:00