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 /routers/api | |
| parent | 2e85e70e38d421c9d0b643c7dbd2b0f4c5ed0cbc (diff) | |
| download | gitea-7fb09f035ac8b10191c154ed4395a8e02d3c5e8d.tar.gz gitea-7fb09f035ac8b10191c154ed4395a8e02d3c5e8d.zip | |
Fix #5799 - swagger for mergePullRequest (#5996)
Diffstat (limited to 'routers/api')
| -rw-r--r-- | routers/api/v1/repo/pull.go | 4 | ||||
| -rw-r--r-- | routers/api/v1/swagger/options.go | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go index 64c7e94474..e7c12b9038 100644 --- a/routers/api/v1/repo/pull.go +++ b/routers/api/v1/repo/pull.go @@ -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" diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index 177fe415f1..5aaee8d6ea 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -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 |