diff --git a/docusaurus.config.js b/docusaurus.config.js index 8d63556b..b982d4b7 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -82,11 +82,11 @@ const globalVariables = { goVersion: "1.26", minGoVersion: "1.26", minNodeVersion: "22", - version: "1.26.3", - sourceVersion: "v1.26.3", + version: "1.26.4", + sourceVersion: "v1.26.4", sourceBranch: "release/v1.26", - dockerVersion: "1.26.3", - displayVersion: "1.26.3", + dockerVersion: "1.26.4", + displayVersion: "1.26.4", }, "1.25": { goVersion: "1.25", @@ -417,7 +417,7 @@ const config = { position: "right", items: [ { to: "/api/next/", label: "1.27-dev" }, - { to: "/api/1.26/", label: "1.26.3" }, + { to: "/api/1.26/", label: "1.26.4" }, { to: "/api/1.25/", label: "1.25.5" }, { to: "/api/1.24/", label: "1.24.7" }, { to: "/api/1.23/", label: "1.23.8" }, diff --git a/static/swagger-26.json b/static/swagger-26.json index b77059f7..4e3d3461 100644 --- a/static/swagger-26.json +++ b/static/swagger-26.json @@ -17,7 +17,7 @@ "name": "MIT", "url": "http://opensource.org/licenses/MIT" }, - "version": "1.26.3" + "version": "1.26.4" }, "basePath": "https://gitea.com/api/v1", "paths": { @@ -26771,10 +26771,14 @@ "description": "MergePullRequestForm form for merging Pull Request", "type": "object", "required": [ - "Do" + "do" ], "properties": { - "Do": { + "delete_branch_after_merge": { + "type": "boolean", + "x-go-name": "DeleteBranchAfterMerge" + }, + "do": { "type": "string", "enum": [ "merge", @@ -26783,20 +26787,8 @@ "squash", "fast-forward-only", "manually-merged" - ] - }, - "MergeCommitID": { - "type": "string" - }, - "MergeMessageField": { - "type": "string" - }, - "MergeTitleField": { - "type": "string" - }, - "delete_branch_after_merge": { - "type": "boolean", - "x-go-name": "DeleteBranchAfterMerge" + ], + "x-go-name": "Do" }, "force_merge": { "type": "boolean", @@ -26806,6 +26798,18 @@ "type": "string", "x-go-name": "HeadCommitID" }, + "merge_commit_id": { + "type": "string", + "x-go-name": "MergeCommitID" + }, + "merge_message_field": { + "type": "string", + "x-go-name": "MergeMessageField" + }, + "merge_title_field": { + "type": "string", + "x-go-name": "MergeTitleField" + }, "merge_when_checks_succeed": { "type": "boolean", "x-go-name": "MergeWhenChecksSucceed" @@ -31069,4 +31073,4 @@ "TOTPHeader": [] } ] -} +} \ No newline at end of file diff --git a/update_api_docs.sh b/update_api_docs.sh index b0f3690e..d9497003 100755 --- a/update_api_docs.sh +++ b/update_api_docs.sh @@ -25,7 +25,7 @@ inplace_sed 's|"version": "{{.SwaggerAppVer}}"|"version": "dev"|' v1_json.tmpl inplace_sed 's|"basePath": "{{.SwaggerAppSubUrl}}/api/v1"|"basePath": "https://gitea.com/api/v1"|' v1_json.tmpl mv v1_json.tmpl static/swagger-latest.json -for ver in '1.26.3' '1.25.5' '1.24.7' '1.23.8' '1.22.6'; do +for ver in '1.26.4' '1.25.5' '1.24.7' '1.23.8' '1.22.6'; do curl --silent --output v1_json.tmpl https://raw.githubusercontent.com/go-gitea/gitea/refs/tags/v${ver}/templates/swagger/v1_json.tmpl inplace_sed "s|\"version\": \"{{.SwaggerAppVer}}\"|\"version\": \"${ver}\"|" v1_json.tmpl inplace_sed 's|"basePath": "{{.SwaggerAppSubUrl}}/api/v1"|"basePath": "https://gitea.com/api/v1"|' v1_json.tmpl