From d252d4eb8c739012ce127674c4e65b720724790b Mon Sep 17 00:00:00 2001
From: Thomas Loubiou <xabufr@users.noreply.github.com>
Date: Sat, 9 Feb 2019 13:48:28 +0100
Subject: [PATCH] Remove extra spaces (#6016)

---
 modules/auth/repo_form.go      | 2 +-
 templates/swagger/v1_json.tmpl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 3f5078171a83..58be0ec3ae51 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 d77c5b708e49..a24bf3838cf3 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": {