parent
2e85e70e38
commit
7fb09f035a
|
@ -364,7 +364,10 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
|
||||||
// \/ \/ |__| \/ \/
|
// \/ \/ |__| \/ \/
|
||||||
|
|
||||||
// MergePullRequestForm form for merging Pull Request
|
// MergePullRequestForm form for merging Pull Request
|
||||||
|
// swagger:model MergePullRequestOption
|
||||||
type MergePullRequestForm struct {
|
type MergePullRequestForm struct {
|
||||||
|
// required: true
|
||||||
|
// enum: merge, rebase, rebase-merge, squash
|
||||||
Do string `binding:"Required;In(merge,rebase,rebase-merge,squash)"`
|
Do string `binding:"Required;In(merge,rebase,rebase-merge,squash)"`
|
||||||
MergeTitleField string
|
MergeTitleField string
|
||||||
MergeMessageField string
|
MergeMessageField string
|
||||||
|
|
|
@ -518,6 +518,10 @@ func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
|
||||||
// type: integer
|
// type: integer
|
||||||
// format: int64
|
// format: int64
|
||||||
// required: true
|
// required: true
|
||||||
|
// - name: body
|
||||||
|
// in: body
|
||||||
|
// schema:
|
||||||
|
// $ref: "#/definitions/MergePullRequestOption"
|
||||||
// responses:
|
// responses:
|
||||||
// "200":
|
// "200":
|
||||||
// "$ref": "#/responses/empty"
|
// "$ref": "#/responses/empty"
|
||||||
|
|
|
@ -68,6 +68,8 @@ type swaggerParameterBodies struct {
|
||||||
CreatePullRequestOption api.CreatePullRequestOption
|
CreatePullRequestOption api.CreatePullRequestOption
|
||||||
// in:body
|
// in:body
|
||||||
EditPullRequestOption api.EditPullRequestOption
|
EditPullRequestOption api.EditPullRequestOption
|
||||||
|
// in:body
|
||||||
|
MergePullRequestOption auth.MergePullRequestForm
|
||||||
|
|
||||||
// in:body
|
// in:body
|
||||||
CreateReleaseOption api.CreateReleaseOption
|
CreateReleaseOption api.CreateReleaseOption
|
||||||
|
|
|
@ -3931,6 +3931,13 @@
|
||||||
"name": "index",
|
"name": "index",
|
||||||
"in": "path",
|
"in": "path",
|
||||||
"required": true
|
"required": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "body",
|
||||||
|
"in": "body",
|
||||||
|
"schema": {
|
||||||
|
"$ref": "#/definitions/MergePullRequestOption"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"responses": {
|
"responses": {
|
||||||
|
@ -7700,6 +7707,32 @@
|
||||||
},
|
},
|
||||||
"x-go-package": "code.gitea.io/gitea/vendor/code.gitea.io/sdk/gitea"
|
"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": {
|
"MigrateRepoForm": {
|
||||||
"description": "MigrateRepoForm form for migrating repository",
|
"description": "MigrateRepoForm form for migrating repository",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
|
|
Loading…
Reference in a new issue