tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Add force_merge to merge request and fix checking mergable (#23010)

Browse Source 
Fix #23000.
This commit is contained in:
Jason Song
2023-02-21 22:42:07 +08:00
committed by GitHub
parent 1fcf96ad01
commit c8c2a31818
6 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/forms/repo_form.go
View File

@@ -604,7 +604,7 @@ type MergePullRequestForm struct {
MergeMessageField string
MergeCommitID string // only used for manually-merged
HeadCommitID string `json:"head_commit_id,omitempty"`
ForceMerge *bool `json:"force_merge,omitempty"`
ForceMerge bool `json:"force_merge,omitempty"`
MergeWhenChecksSucceed bool `json:"merge_when_checks_succeed,omitempty"`
DeleteBranchAfterMerge bool `json:"delete_branch_after_merge,omitempty"`
}