From 561faf9af5a2c89461625275aaf46ac4071a5b50 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Mon, 24 Jul 2023 08:57:21 +0200
Subject: [PATCH] [SEMVER] 6.0.0+0-gitea-1.21.0

(cherry picked from commit 4107d99f25a9eee1eab2b52cdd579c69523366da)
(cherry picked from commit 7e097b945c0dab444485c68d4a583b9dcef6952c)
(cherry picked from commit 431edaac36e263c4b99cdab076bc402ed1ee4819)
(cherry picked from commit 51ecd89e31f8e4b1fa50422f26e5c01a1961b9a3)
(cherry picked from commit 734d7f5bc7326479d5389a71c2f1bbcc1c03c41a)
(cherry picked from commit f34e88d00cc1077cef3611f8c49406851bdd6d7e)
(cherry picked from commit cd882a75f95bc0612b5f429efd066922db3def73)
(cherry picked from commit 7dfa28db3f8c1d61ecd22e5b52b479c62a6d1ae5)
(cherry picked from commit 4bdaeeb68679e30e1f578fcee418f0c2fb7445f8)
(cherry picked from commit a0e8285914e99312fa6eab657e91e70d05e766f7)
(cherry picked from commit 72991a99f3010b59981133013983b7424605aec4)
(cherry picked from commit c99949bbf7768b6572e414e42ba40c0a110cf82e)
(cherry picked from commit d4dd7df8e7cadd0c3ac7214c0bb1245b4cb965dd)
(cherry picked from commit 1fe5c1e81e611fa30b39d8fce564bac12d6de880)
(cherry picked from commit 969b727c508e3498feefaac7fad4a5deafab6861)
(cherry picked from commit f2061a87c0a798acb00f464debba6ea149d7d8bf)
(cherry picked from commit 2d75f86f0e4c4da24fb965e7f605296c303b7ea7)
(cherry picked from commit 29119a870f5fa68e5ddafdfa1bb388d385396f6b)
(cherry picked from commit 76dd36c9eb116d042ba25b4d241a9b1e5ca37bfb)
(cherry picked from commit ea761bd43c7042b7d4ac4fad20b0c9e780f6e553)
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7e4c66e5a1..2a1f6f00ec 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ endif
 VERSION = ${GITEA_VERSION}
 
 # SemVer
-FORGEJO_VERSION := 5.0.0+0-gitea-1.20.0
+FORGEJO_VERSION := 6.0.0+0-gitea-1.21.0
 
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" -X "code.gitea.io/gitea/routers/api/forgejo/v1.ForgejoVersion=$(FORGEJO_VERSION)"