Merge branch 'main' into audit

static/openapi3-latest.json

@@ -6311,6 +6311,14 @@
             "type": "integer",
             "x-go-name": "SourceID"
           },
+          "type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/UserTypeString"
+              }
+            ],
+            "description": "The user type"
+          },
           "visibility": {
             "allOf": [
               {
@@ -10722,6 +10730,14 @@
             "type": "integer",
             "x-go-name": "StarredRepos"
           },
+          "type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/UserTypeString"
+              }
+            ],
+            "description": "the user type"
+          },
           "visibility": {
             "allOf": [
               {
@@ -10878,6 +10894,14 @@
         "type": "object",
         "x-go-package": "gitea.dev/modules/structs"
       },
+      "UserTypeString": {
+        "enum": [
+          "User",
+          "Organization",
+          "Bot"
+        ],
+        "type": "string"
+      },
       "VisibilityString": {
         "enum": [
           "public",
@@ -27155,6 +27179,9 @@
           },
           "404": {
             "$ref": "#/components/responses/notFound"
+          },
+          "409": {
+            "$ref": "#/components/responses/error"
           }
         },
         "summary": "Merge a branch from upstream",

static/swagger-latest.json

@@ -14997,6 +14997,9 @@
           },
           "404": {
             "$ref": "#/responses/notFound"
+          },
+          "409": {
+            "$ref": "#/responses/error"
           }
         }
       }
@@ -29389,6 +29392,17 @@
           "format": "int64",
           "x-go-name": "SourceID"
         },
+        "type": {
+          "description": "The user type",
+          "type": "string",
+          "enum": [
+            "User",
+            "Organization",
+            "Bot"
+          ],
+          "x-go-enum-desc": "User UserTypeStringUser\nOrganization UserTypeStringOrganization\nBot UserTypeStringBot",
+          "x-go-name": "Type"
+        },
         "visibility": {
           "description": "User visibility level: public, limited, or private",
           "type": "string",
@@ -33751,6 +33765,17 @@
           "format": "int64",
           "x-go-name": "StarredRepos"
         },
+        "type": {
+          "description": "the user type",
+          "type": "string",
+          "enum": [
+            "User",
+            "Organization",
+            "Bot"
+          ],
+          "x-go-enum-desc": "User UserTypeStringUser\nOrganization UserTypeStringOrganization\nBot UserTypeStringBot",
+          "x-go-name": "Type"
+        },
         "visibility": {
           "description": "User visibility level option: public, limited, private",
           "type": "string",