From f5f690ebd98da7c34c35e87e991fb92294cd2791 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 6 Aug 2021 10:12:10 -0700
Subject: [PATCH] Version 1.21.6

---
 CHANGELOG             | 8 ++++++++
 CloudronManifest.json | 2 +-
 DESCRIPTION.md        | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7a197bc..e1db2ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -771,3 +771,11 @@
 * Fix crash following ldap authentication update (#16447) (#16449)
 * Redirect on bad CSRF instead of presenting bad page (#14937) (#16378)
 
+[1.21.6]
+* Update Gitea to 1.14.6
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.6)
+* SECURITY
+  * Bump github.com/markbates/goth from v1.67.1 to v1.68.0 (#16538) (#16540)
+  * Switch to maintained JWT lib (#16532) (#16535)
+  * Upgrade to latest version of golang-jwt (as forked for 1.14) (#16590) (#16607)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index e57afc7..341a347 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -4,7 +4,7 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.21.5",
+  "version": "1.21.6",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 40f768e..4df60bb 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.14.5</upstream>
+This app packages Gitea <upstream>1.14.6</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.