From 7fb09f035ac8b10191c154ed4395a8e02d3c5e8d Mon Sep 17 00:00:00 2001
From: Thomas Loubiou <xabufr@users.noreply.github.com>
Date: Fri, 8 Feb 2019 09:08:38 +0100
Subject: Fix #5799 - swagger for mergePullRequest (#5996)

---
 templates/swagger/v1_json.tmpl | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'templates/swagger')

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 6ecaf861df..d77c5b708e 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -3931,6 +3931,13 @@
             "name": "index",
             "in": "path",
             "required": true
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/MergePullRequestOption"
+            }
           }
         ],
         "responses": {
@@ -7700,6 +7707,32 @@
       },
       "x-go-package": "code.gitea.io/gitea/vendor/code.gitea.io/sdk/gitea"
     },
+    "MergePullRequestOption": {
+      "description": "MergePullRequestForm form for merging Pull Request",
+      "type": "object",
+      "required": [
+        "Do"
+      ],
+      "properties": {
+        "Do": {
+          "type": "string",
+          "enum": [
+            "merge",
+            " rebase",
+            " rebase-merge",
+            " squash"
+          ]
+        },
+        "MergeMessageField": {
+          "type": "string"
+        },
+        "MergeTitleField": {
+          "type": "string"
+        }
+      },
+      "x-go-name": "MergePullRequestForm",
+      "x-go-package": "code.gitea.io/gitea/modules/auth"
+    },
     "MigrateRepoForm": {
       "description": "MigrateRepoForm form for migrating repository",
       "type": "object",
-- 
cgit v1.2.3