diff options
| author | Henry Goodman <79623665+henrygoodman@users.noreply.github.com> | 2024-07-06 04:21:56 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-05 18:21:56 +0000 |
| commit | 12cb1d2998f2a307713ce979f8d585711e92061c (patch) | |
| tree | c103d858c7083b3f320f261d657db6b23bcf2455 /services/forms | |
| parent | 9c00dda33ad7bd594dd8f331fa1bf0acefc2ca54 (diff) | |
| download | gitea-12cb1d2998f2a307713ce979f8d585711e92061c.tar.gz gitea-12cb1d2998f2a307713ce979f8d585711e92061c.zip | |
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:
<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>
Diffstat (limited to 'services/forms')
| -rw-r--r-- | services/forms/repo_form.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 32d96abf4d..a2c2af3fac 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -195,6 +195,10 @@ type ProtectBranchForm struct { WhitelistUsers string WhitelistTeams string WhitelistDeployKeys bool + EnableForcePush string + ForcePushAllowlistUsers string + ForcePushAllowlistTeams string + ForcePushAllowlistDeployKeys bool EnableMergeWhitelist bool MergeWhitelistUsers string MergeWhitelistTeams string |