Backport #37214 The only conflict is go.mod Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Generated
+20
-16
@@ -26771,10 +26771,14 @@
|
||||
"description": "MergePullRequestForm form for merging Pull Request",
|
||||
"type": "object",
|
||||
"required": [
|
||||
"Do"
|
||||
"do"
|
||||
],
|
||||
"properties": {
|
||||
"Do": {
|
||||
"delete_branch_after_merge": {
|
||||
"type": "boolean",
|
||||
"x-go-name": "DeleteBranchAfterMerge"
|
||||
},
|
||||
"do": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"merge",
|
||||
@@ -26783,20 +26787,8 @@
|
||||
"squash",
|
||||
"fast-forward-only",
|
||||
"manually-merged"
|
||||
]
|
||||
},
|
||||
"MergeCommitID": {
|
||||
"type": "string"
|
||||
},
|
||||
"MergeMessageField": {
|
||||
"type": "string"
|
||||
},
|
||||
"MergeTitleField": {
|
||||
"type": "string"
|
||||
},
|
||||
"delete_branch_after_merge": {
|
||||
"type": "boolean",
|
||||
"x-go-name": "DeleteBranchAfterMerge"
|
||||
],
|
||||
"x-go-name": "Do"
|
||||
},
|
||||
"force_merge": {
|
||||
"type": "boolean",
|
||||
@@ -26806,6 +26798,18 @@
|
||||
"type": "string",
|
||||
"x-go-name": "HeadCommitID"
|
||||
},
|
||||
"merge_commit_id": {
|
||||
"type": "string",
|
||||
"x-go-name": "MergeCommitID"
|
||||
},
|
||||
"merge_message_field": {
|
||||
"type": "string",
|
||||
"x-go-name": "MergeMessageField"
|
||||
},
|
||||
"merge_title_field": {
|
||||
"type": "string",
|
||||
"x-go-name": "MergeTitleField"
|
||||
},
|
||||
"merge_when_checks_succeed": {
|
||||
"type": "boolean",
|
||||
"x-go-name": "MergeWhenChecksSucceed"
|
||||
|
||||
Reference in New Issue
Block a user