From 65a87ede586f0fad61541e91687442e1920ee719 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Mon, 8 Mar 2021 11:41:13 +0100
Subject: [PATCH] Bump version for 1.13.4

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

diff --git a/CHANGELOG b/CHANGELOG
index 809c496..83dec2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -657,3 +657,12 @@
 * Accept multiple SSH keys in single LDAP SSHPublicKey attribute (#13989) (#14607)
 * Fix bug about ListOptions and stars/watchers pagnation (#14556) (#14573)
 * Fix GPG key deletion during account deletion (#14561) (#14569)
+
+[1.20.2]
+* Update Gitea to 1.13.4
+* Fix issue popups (#14898) (#14899)
+* Fix race in LFS ContentStore.Put(...) (#14895) (#14913)
+* Fix a couple of issues with a feeds (#14897) (#14903)
+* When transfering repository and database transaction failed, rollback the renames (#14864) (#14902)
+* Fix race in local storage (#14888) (#14901)
+* Fix 500 on pull view page if user is not loged in (#14885) (#14886)
diff --git a/CloudronManifest.json b/CloudronManifest.json
index a63f8a2..e6b6d50 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.20.1",
+  "version": "1.20.2",
   "healthCheckPath": "/healthcheck",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index db6500f..c60c204 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.13.3</upstream>
+This app packages Gitea <upstream>1.13.4</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
 
diff --git a/Dockerfile b/Dockerfile
index 3a5350b..27e652a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN passwd -d git
 RUN mkdir -p /home/git/gitea
 WORKDIR /home/git
 
-ARG VERSION=1.13.3
+ARG VERSION=1.13.4
 
 RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
     && chmod +x /home/git/gitea/gitea