From 78e512770ff9a749675343a5668b142eeb3df251 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 12 Dec 2023 16:13:43 +0100 Subject: [PATCH 1/2] [SEMVER] 7.0.0+0-gitea-1.22.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6588d67d78..64577e262d 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,7 @@ endif VERSION = ${GITEA_VERSION} # SemVer -FORGEJO_VERSION := 6.0.0+0-gitea-1.21.0 +FORGEJO_VERSION := 7.0.0+0-gitea-1.22.0 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" -X "main.ForgejoVersion=$(FORGEJO_VERSION)" From 1d24c09f4977e43f002f591db0183236160344d6 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Tue, 12 Dec 2023 16:14:02 +0100 Subject: [PATCH 2/2] [DOCS] RELEASE-NOTES.md (squash) v1.21.2-1 --- RELEASE-NOTES.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 9730ed10f0..9806a354c9 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -4,6 +4,38 @@ A Forgejo release is published shortly after a Gitea release is published and th The Forgejo admin should carefully read the required manual actions before upgrading. A point release (e.g. v1.21.1-0 or v1.21.2-0) does not require manual actions but others might (e.g. v1.20, v1.21). +## 1.21.2-1 + +The [complete list of commits](https://codeberg.org/forgejo/forgejo/commits/branch/v1.21/forgejo) included in the `Forgejo v1.21.2-1` release can be reviewed from the command line with: + +```shell +$ git clone https://codeberg.org/forgejo/forgejo/ +$ git -C forgejo log --oneline --no-merges v1.21.2-0..v1.21.2-1 +``` + +This stable release contains a **security fix**, as explained in the [v1.21.2-1 companion blog post](https://forgejo.org/2023-12-release-v1-21-2-1/). + +* Recommended Action + + We **strongly recommend** that all Forgejo installations are [upgraded](https://forgejo.org/docs/v1.21/admin/upgrade/) to the latest version as soon as possible. + +* [Forgejo Semantic Version](https://forgejo.org/docs/v1.21/user/semver/) + + The semantic version was updated to `6.0.2+0-gitea-1.21.2` + +* Security fix + + The project page [of private users](https://forgejo.org/2023-12-release-v1-21-2-1/) is no longer publicly visible. + +* Bug fixes + + The most prominent ones are described here, others can be found in the list of commits included in the release as described above. + + * The default preferred licenses for the [[repository].PREFERRED_LICENSES](https://forgejo.org/docs/v1.21/admin/config-cheat-sheet/#repository-repository) setting were incorrect and have been [fixed to be `Apache-2.0` and `MIT`](https://codeberg.org/forgejo/forgejo/commit/5258e8f63d649b016d5c5d0e37422723bef26dac). + * A failed cron job can [no longer cause the Forgejo instance to shutdown](https://codeberg.org/forgejo/forgejo/commit/026a4bb02d8ac0b0dd90eb8a89c25ae18abca34f). + * A pull request merged by a workflow using the [automatic token](https://forgejo.org/docs/v1.21/user/actions/#automatic-token) with the `auto merge` flag [no longer cause an error 500 when displaying the pull request page](https://codeberg.org/forgejo/forgejo/commit/4148fb27dbc337a433b41d6d450d48fad73239cc). + * [Tentative fix for when the database branch cache is out of sync with the branches found in Git repositories](https://codeberg.org/forgejo/forgejo/commit/14750f3d11c8d065d3f9af31b8b4ee8d28acd0a5). When in doubt it is recommended to click on `Sync missed branches from git data to databases` in the `/admin` dashboard. + ## 1.21.2-0 The [complete list of commits](https://codeberg.org/forgejo/forgejo/commits/branch/v1.21/forgejo) included in the `Forgejo v1.21.2-0` release can be reviewed from the command line with: