0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-16 19:04:03 +01:00
gitea/modules/structs
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
..
activity.go Document possible action types for the user activity feed API (#31196) 2024-06-03 13:40:48 +00:00
activitypub.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
admin_user.go chore(api): support ignore password if login source type is LDAP for creating user API (#28491) 2023-12-19 02:32:45 +00:00
attachment.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
commit_status.go Restore warning commit status (#27504) 2023-10-08 22:16:06 +00:00
commit_status_test.go refactor improve NoBetterThan (#26126) 2023-07-26 08:52:07 +00:00
cron.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
doc.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
fork.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
git_blob.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
git_hook.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
hook.go Add branch_filter to hooks API endpoints (#26599) 2023-08-21 11:43:52 +00:00
issue.go Make gitea webhooks openproject compatible (#28435) 2024-05-26 04:08:13 +00:00
issue_comment.go Add API management for issue/pull and comment attachments (#21783) 2022-12-09 14:35:56 +08:00
issue_label.go Support using label names when changing issue labels (#30943) 2024-05-13 04:28:53 +00:00
issue_milestone.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_reaction.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_stopwatch.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_tracked_time.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
lfs_lock.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
mirror.go Fix push mirror, wrong timestamp format (#27153) 2023-09-23 12:15:05 +00:00
miscellaneous.go Fix missing images in editor preview due to wrong links (#31299) 2024-06-17 14:16:14 +08:00
nodeinfo.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
notifications.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
org.go Allow Organisations to have a E-Mail (#25082) 2023-07-25 08:26:27 +00:00
org_member.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
org_team.go Increase max length of org team names from 30 to 255 characters (#31410) 2024-06-19 10:36:09 -04:00
package.go Fix package webhook (#27839) 2023-10-31 04:43:38 +00:00
pull.go Make gitea webhooks openproject compatible (#28435) 2024-05-26 04:08:13 +00:00
pull_review.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
release.go add Upload URL to release API (#26663) 2023-08-24 10:36:10 +00:00
repo.go Add topics for repository API (#31127) 2024-05-28 10:03:54 +00:00
repo_actions.go Add API endpoints for getting action jobs status (#26673) 2024-05-01 09:40:23 +08:00
repo_branch.go Allow force push to protected branches (#28086) 2024-07-05 18:21:56 +00:00
repo_collaborator.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo_commit.go Add file status for API "Get a single commit from a repository" (#16205) (#25831) 2023-07-20 16:35:47 +08:00
repo_compare.go feat(api): implement branch/commit comparison API (#30349) 2024-04-16 11:45:04 +08:00
repo_file.go Refactor "Content" for file uploading (#25851) 2023-07-18 18:14:47 +00:00
repo_key.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo_note.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo_refs.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo_tag.go Add tag protection via rest api #17862 (#31295) 2024-06-14 18:56:10 +02:00
repo_topic.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo_tree.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
repo_watch.go Replace interface{} with any (#25686) 2023-07-04 18:36:08 +00:00
repo_wiki.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
secret.go refactor(API): refactor secret creation and update functionality (#26751) 2023-08-28 13:08:19 +08:00
settings.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
status.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
task.go Make repo migration cancelable and fix various bugs (#24605) 2023-05-11 08:25:46 +00:00
user.go Make gitea webhooks openproject compatible (#28435) 2024-05-26 04:08:13 +00:00
user_app.go Add scopes to API to create token and display them (#22989) 2023-02-20 15:28:44 -06:00
user_email.go add admin API email endpoints (#22792) 2023-03-14 03:54:40 -04:00
user_gpgkey.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
user_key.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
variable.go Add API for Variables (#29520) 2024-03-28 20:40:35 +00:00
visible_type.go change org_type.go to visible_type.go and fix the notes (#22752) 2023-02-09 06:40:34 +00:00