diff options
Diffstat (limited to 'templates/swagger/v1_json.tmpl')
-rw-r--r-- | templates/swagger/v1_json.tmpl | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 1b1d9e5c97..930af907ea 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -13586,6 +13586,11 @@ "description": "EditRepoOption options when editing a repository's properties", "type": "object", "properties": { + "allow_manual_merge": { + "description": "either `true` to allow mark pr as merged manually, or `false` to prevent it. `has_pull_requests` must be `true`.", + "type": "boolean", + "x-go-name": "AllowManualMerge" + }, "allow_merge_commits": { "description": "either `true` to allow merging pull requests with a merge commit, or `false` to prevent merging pull requests with merge commits. `has_pull_requests` must be `true`.", "type": "boolean", @@ -13611,6 +13616,11 @@ "type": "boolean", "x-go-name": "Archived" }, + "autodetect_manual_merge": { + "description": "either `true` to enable AutodetectManualMerge, or `false` to prevent it. `has_pull_requests` must be `true`, Note: In some special cases, misjudgments can occur.", + "type": "boolean", + "x-go-name": "AutodetectManualMerge" + }, "default_branch": { "description": "sets the default branch for this repository.", "type": "string", @@ -14596,9 +14606,13 @@ "merge", "rebase", "rebase-merge", - "squash" + "squash", + "manually-merged" ] }, + "MergeCommitID": { + "type": "string" + }, "MergeMessageField": { "type": "string" }, |