parent
2e85e70e38
commit
7fb09f035a
4 changed files with 42 additions and 0 deletions
|
@ -364,7 +364,10 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
|
|||
// \/ \/ |__| \/ \/
|
||||
|
||||
// MergePullRequestForm form for merging Pull Request
|
||||
// swagger:model MergePullRequestOption
|
||||
type MergePullRequestForm struct {
|
||||
// required: true
|
||||
// enum: merge, rebase, rebase-merge, squash
|
||||
Do string `binding:"Required;In(merge,rebase,rebase-merge,squash)"`
|
||||
MergeTitleField string
|
||||
MergeMessageField string
|
||||
|
|
|
@ -518,6 +518,10 @@ func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
|
|||
// type: integer
|
||||
// format: int64
|
||||
// required: true
|
||||
// - name: body
|
||||
// in: body
|
||||
// schema:
|
||||
// $ref: "#/definitions/MergePullRequestOption"
|
||||
// responses:
|
||||
// "200":
|
||||
// "$ref": "#/responses/empty"
|
||||
|
|
|
@ -68,6 +68,8 @@ type swaggerParameterBodies struct {
|
|||
CreatePullRequestOption api.CreatePullRequestOption
|
||||
// in:body
|
||||
EditPullRequestOption api.EditPullRequestOption
|
||||
// in:body
|
||||
MergePullRequestOption auth.MergePullRequestForm
|
||||
|
||||
// in:body
|
||||
CreateReleaseOption api.CreateReleaseOption
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue