diff options
| author | Thomas Loubiou <xabufr@users.noreply.github.com> | 2019-02-08 09:08:38 +0100 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2019-02-08 08:08:38 +0000 |
| commit | 7fb09f035ac8b10191c154ed4395a8e02d3c5e8d (patch) | |
| tree | f1d9b0363a3fca79788b48e8a8d67d9169530549 /templates/swagger | |
| parent | 2e85e70e38d421c9d0b643c7dbd2b0f4c5ed0cbc (diff) | |
| download | gitea-7fb09f035ac8b10191c154ed4395a8e02d3c5e8d.tar.gz gitea-7fb09f035ac8b10191c154ed4395a8e02d3c5e8d.zip | |
Fix #5799 - swagger for mergePullRequest (#5996)
Diffstat (limited to 'templates/swagger')
| -rw-r--r-- | templates/swagger/v1_json.tmpl | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 6ecaf861df..d77c5b708e 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -3931,6 +3931,13 @@ "name": "index", "in": "path", "required": true + }, + { + "name": "body", + "in": "body", + "schema": { + "$ref": "#/definitions/MergePullRequestOption" + } } ], "responses": { @@ -7700,6 +7707,32 @@ }, "x-go-package": "code.gitea.io/gitea/vendor/code.gitea.io/sdk/gitea" }, + "MergePullRequestOption": { + "description": "MergePullRequestForm form for merging Pull Request", + "type": "object", + "required": [ + "Do" + ], + "properties": { + "Do": { + "type": "string", + "enum": [ + "merge", + " rebase", + " rebase-merge", + " squash" + ] + }, + "MergeMessageField": { + "type": "string" + }, + "MergeTitleField": { + "type": "string" + } + }, + "x-go-name": "MergePullRequestForm", + "x-go-package": "code.gitea.io/gitea/modules/auth" + }, "MigrateRepoForm": { "description": "MigrateRepoForm form for migrating repository", "type": "object", |