From d00238c1ad70d4217fe37bd611a46f10a57dcc30 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Fri, 30 Dec 2022 09:47:38 +0100
Subject: [PATCH] Bump version

---
 CHANGELOG.md          | 12 ++++++++++++
 CloudronManifest.json |  4 ++--
 Dockerfile            |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0fac48..cde4d8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1080,3 +1080,15 @@
 [1.25.1]
 * Trust reverse proxy IP
 
+[1.26.0]
+* Update Gitea to 1.18.0
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.18.0)
+* Remove ReverseProxy authentication from the API (#22219) (#22251)
+* Support Go Vulnerability Management (#21139)
+* Forbid HTML string tooltips (#20935)
+* Rework mailer settings (#18982)
+* Remove U2F support (#20141)
+* Refactor i18n to locale (#20153)
+* Enable contenthash in filename for dynamic assets (#20813)
+* And a lot more enhancements
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index fa27174..5e9ab07 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -4,8 +4,8 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.25.1",
-  "upstreamVersion": "1.17.4",
+  "version": "1.26.0",
+  "upstreamVersion": "1.18.0",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/Dockerfile b/Dockerfile
index 56a09d3..315eb9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ WORKDIR /home/git
 # for autosign feature
 ENV GNUPGHOME="/app/data/gnupg"
 
-ARG VERSION=1.17.4
+ARG VERSION=1.18.0
 
 RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
     && chmod +x /home/git/gitea/gitea