summaryrefslogtreecommitdiffstats
path: root/routers/api/v1/swagger
diff options
context:
space:
mode:
authorThomas Loubiou <xabufr@users.noreply.github.com>2019-02-08 09:08:38 +0100
committerzeripath <art27@cantab.net>2019-02-08 08:08:38 +0000
commit7fb09f035ac8b10191c154ed4395a8e02d3c5e8d (patch)
treef1d9b0363a3fca79788b48e8a8d67d9169530549 /routers/api/v1/swagger
parent2e85e70e38d421c9d0b643c7dbd2b0f4c5ed0cbc (diff)
downloadgitea-7fb09f035ac8b10191c154ed4395a8e02d3c5e8d.tar.gz
gitea-7fb09f035ac8b10191c154ed4395a8e02d3c5e8d.zip
Fix #5799 - swagger for mergePullRequest (#5996)
Diffstat (limited to 'routers/api/v1/swagger')
-rw-r--r--routers/api/v1/swagger/options.go2
1 files changed, 2 insertions, 0 deletions
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