lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove extra spaces (#6016)

release/v1.15
Thomas Loubiou 2019-02-09 13:48:28 +01:00 committed by Lauris BH
parent 8c865f3ce8
commit d252d4eb8c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/auth/repo_form.go
View File

@ -367,7 +367,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
// swagger:model MergePullRequestOption // swagger:model MergePullRequestOption
type MergePullRequestForm struct { type MergePullRequestForm struct {
// required: true // required: true
// enum: merge, rebase, rebase-merge, squash // 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

6
templates/swagger/v1_json.tmpl
View File

@ -7718,9 +7718,9 @@
"type": "string", "type": "string",
"enum": [ "enum": [
"merge", "merge",
" rebase", "rebase",
" rebase-merge", "rebase-merge",
" squash" "squash"
] ]
}, },
"MergeMessageField": { "MergeMessageField": {