Fix #5799 - swagger for mergePullRequest (#5996)

2019-02-08 09:08:38 +01:00 · 2019-02-08 09:08:38 +01:00 · 7fb09f035a
commit 7fb09f035a
parent 2e85e70e38
4 changed files with 42 additions and 0 deletions
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@ -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