aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Loubiou <xabufr@users.noreply.github.com>2019-02-09 13:48:28 +0100
committerLauris BH <lauris@nix.lv>2019-02-09 14:48:28 +0200
commitd252d4eb8c739012ce127674c4e65b720724790b (patch)
treea326b80d140b468ccc7e1483acff9c60fa61ac50
parent8c865f3ce89348cbb9b3f4c2dd31e9767ab0a01a (diff)
downloadgitea-d252d4eb8c739012ce127674c4e65b720724790b.tar.gz
gitea-d252d4eb8c739012ce127674c4e65b720724790b.zip
Remove extra spaces (#6016)
-rw-r--r--modules/auth/repo_form.go2
-rw-r--r--templates/swagger/v1_json.tmpl6
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 3f5078171a..58be0ec3ae 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -367,7 +367,7 @@ func (f *InitializeLabelsForm) Validate(ctx *macaron.Context, errs binding.Error
// swagger:model MergePullRequestOption
type MergePullRequestForm struct {
// required: true
- // enum: merge, rebase, rebase-merge, squash
+ // enum: merge,rebase,rebase-merge,squash
Do string `binding:"Required;In(merge,rebase,rebase-merge,squash)"`
MergeTitleField string
MergeMessageField string
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index d77c5b708e..a24bf3838c 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -7718,9 +7718,9 @@
"type": "string",
"enum": [
"merge",
- " rebase",
- " rebase-merge",
- " squash"
+ "rebase",
+ "rebase-merge",
+ "squash"
]
},
"MergeMessageField": {