Merge remote-tracking branch 'forgejo/forgejo-development' into forgejo

RELEASE-NOTES.md

@@ -40,15 +40,17 @@ $ git -C forgejo log --oneline --no-merges origin/v1.18/forgejo..origin/v1.19/fo
     The algorithm for validating user names was modified and some users may have invalid names. The command `forgejo doctor --run check-user-names` will list all of them so they can be renamed.
 
     If a Forgejo instance has users or organizations named `forgejo-actions` and `gitea-actions`, they will also need to be renamed before the upgrade. They are now reserved names for the experimental internal CI/CD named `Actions`.
+
+  * [Semantic version](https://forgejo.org/docs/latest/user/semver)
+
+    Since v1.18.5, in addition to the Forgejo release number, a [semantic version](https://semver.org/#semantic-versioning-200) number (e.g. `v3.0.0`) can be obtained from the `number` key of a new `/api/forgejo/v1/version` endpoint.
+
+    Now, it reflects the Gitea version that Forgejo depends on, is no longer prefixed with `v` (e.g. `3.0.0+0-gitea-1.19.0`), and can be obtained from the `version` key of the same endpoint.
 * Features
 
   * [Documentation](https://forgejo.org/docs/latest/)
     The first version of the [Forgejo documentation](https://forgejo.org/docs/latest/) is available and covers the administration of Forgejo, from installation to troubleshooting.
 
-   * [Semantic version](https://forgejo.org/docs/latest/user/semver)
-     In addition to the Forgejo release number, a [semantic version](https://semver.org/#semantic-versioning-200) number can be obtained from the
-     `/api/forgejo/v1/version` and now reflects the Gitea version that Forgejo depends on (e.g. `3.0.0+0-gitea-1.19.0`).
-
     [Read more about semantic versions](https://forgejo.codeberg.page/docs/v1.19/user/semver)
 
   * [Webhook authorization header](https://codeberg.org/forgejo/forgejo/commit/b6e81357bd6fb80f8ba94c513f89a210beb05313)
@@ -97,7 +99,7 @@ $ git -C forgejo log --oneline --no-merges origin/v1.18/forgejo..origin/v1.19/fo
 
     <img src="./releases/images/forgejo-v1.19-oidc-part2.png" alt="OIDC Group mapping part2" width="500" />
 
-     [Read more about OIDC groups mapping](https://forgejo.org/docs/v1.19/admin/oauth2-provider/#endpoints)
+    [Read more about OIDC groups mapping](https://forgejo.org/docs/v1.19/user/oauth2-provider/#endpoints)
 
   * [RSS feed for releases and tags](https://codeberg.org/forgejo/forgejo/commit/48d71b7d6)
 

public/forgejo/api.v1.yml

@@ -35,6 +35,6 @@ components:
     Version:
       type: object
       properties:
-        number:
+        version:
           type: string
 

routers/api/forgejo/v1/generated.go

@@ -12,7 +12,7 @@ import (
 
 // Version defines model for Version.
 type Version struct {
-	Number *string `json:"number,omitempty"`
+	Version *string `json:"version,omitempty"`
 }
 
 // ServerInterface represents all server handlers.

tests/integration/api_forgejo_version_test.go

@@ -21,5 +21,5 @@ func TestAPIForgejoVersion(t *testing.T) {
 
 	var version v1.Version
 	DecodeJSON(t, resp, &version)
-	assert.Equal(t, "development", *version.Number)
+	assert.Equal(t, "development", *version.Version)
 }

webpack.config.js

@@ -64,7 +64,7 @@ export default {
     ],
     forgejoswagger: [ // Forgejo swagger is OpenAPI 3.0.0 and has specific parameters
 	fileURLToPath(new URL('web_src/js/standalone/forgejo-swagger.js', import.meta.url)),
-	fileURLToPath(new URL('web_src/less/standalone/swagger.less', import.meta.url)),
+	fileURLToPath(new URL('web_src/css/standalone/swagger.css', import.meta.url)),
     ],
     swagger: [
       fileURLToPath(new URL('web_src/js/standalone/swagger.js', import.meta.url)),