diff options
| author | Jason Song <i@wolfogre.com> | 2023-02-21 22:42:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-21 08:42:07 -0600 |
| commit | c8c2a31818527f7377ddb9fb111a55d0c058ebe7 (patch) | |
| tree | 5ebb1653b112dbf66e00d9ec34755382cfd5c6cf /services/forms | |
| parent | 1fcf96ad0166420cbdb013365ecae42e3537b42a (diff) | |
| download | gitea-c8c2a31818527f7377ddb9fb111a55d0c058ebe7.tar.gz gitea-c8c2a31818527f7377ddb9fb111a55d0c058ebe7.zip | |
Add force_merge to merge request and fix checking mergable (#23010)
Fix #23000.
Diffstat (limited to 'services/forms')
| -rw-r--r-- | services/forms/repo_form.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 374ae0ac5c..e9645b5ab7 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -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"` } |