From ba9025d4d50310c6eb42580c9b0e37dbedd07060 Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Mon, 16 Jan 2023 19:48:20 +0000
Subject: [PATCH] fix: update Gitea

- Upgrade Gitea to v1.18.0
- Update the configuration to allow signing merge commits
- Fixed download-gitea.sh
---
 .helpers/download-gitea.sh | 2 +-
 config                     | 2 +-
 templates/gitea/app.ini    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.helpers/download-gitea.sh b/.helpers/download-gitea.sh
index 7951186..d49a1e6 100644
--- a/.helpers/download-gitea.sh
+++ b/.helpers/download-gitea.sh
@@ -4,7 +4,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-export $(cat ./config/flow-platform.cfg | grep GITEA_VERSION | tr -d "\"")
+export $(cat ./config/flow-platform-services.cfg | grep GITEA_VERSION | tr -d "\"")
 
 if ! [ -f ./build/gitea/gitea-${GITEA_VERSION}-linux-amd64 ]; then
     echo "Downloading Gitea ${GITEA_VERSION}..."
diff --git a/config b/config
index dd9694b..846a2e4 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit dd9694baf20bcf5f0898962bd074c1563021eabf
+Subproject commit 846a2e49bf90787f51731dd3c2bf7863eb7582d9
diff --git a/templates/gitea/app.ini b/templates/gitea/app.ini
index 8b984d8..b564415 100644
--- a/templates/gitea/app.ini
+++ b/templates/gitea/app.ini
@@ -13,8 +13,8 @@ LOCAL_COPY_PATH = ${GITEA_TMP}/local-repo
 TEMP_PATH = ${GITEA_TMP}/uploads
 
 [repository.signing]
-; Gitea will sign initial commits only if the user has a public key.
-INITIAL_COMMIT = pubkey
+INITIAL_COMMIT = pubkey, twofa
+MERGES         = pubkey, twofa, basesigned, commitssigned
 
 [ui]
 DEFAULT_THEME = arc-green