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 /modules | |
| parent | 2e85e70e38d421c9d0b643c7dbd2b0f4c5ed0cbc (diff) | |
| download | gitea-7fb09f035ac8b10191c154ed4395a8e02d3c5e8d.tar.gz gitea-7fb09f035ac8b10191c154ed4395a8e02d3c5e8d.zip | |
Fix #5799 - swagger for mergePullRequest (#5996)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/repo_form.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index ff64d9a56b..3f5078171a 100644 --- 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 |