From 6c2c00a53a2ce37c43e1022889a06124d874ea7b Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Mon, 10 May 2021 09:28:21 -0700
Subject: [PATCH] Version 1.21.2

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

diff --git a/CHANGELOG b/CHANGELOG
index c747465..1e8033a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -729,3 +729,14 @@
 * Clone panel fixes (#15436)
 * Use semantic dropdown for code search query type (#15276) (#15364)
 
+[1.21.2]
+* Update Gitea to 1.14.2
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.14.2)
+* Display conflict-free merge messages for pull requests (#15773) (#15796)
+* Exponential Backoff for ByteFIFO (#15724) (#15793)
+* Issue list alignment tweaks (#15483) (#15766)
+* Implement delete release attachments and update release attachments' name (#14130) (#15666)
+* Add placeholder text to deploy key textarea (#15575) (#15576)
+* Project board improvements (#15429) (#15560)
+* Repo branch page: label size, PR ref, new PR button alignment (#15363) (#15365)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 4169ca1..4cc99ae 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.1",
+  "version": "1.21.2",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index fe1b34c..880748e 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.14.1</upstream>
+This app packages Gitea <upstream>1.14.2</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.