From 731be1ccf8a76189fee79f2469a1c10d5d47afca Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 4 Mar 2021 17:08:50 +0100
Subject: [PATCH] Bump version for 1.13.3

---
 CHANGELOG             | 20 ++++++++++++++++++++
 CloudronManifest.json |  2 +-
 DESCRIPTION.md        |  2 +-
 Dockerfile            |  5 +++--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 51c8a3a..809c496 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -637,3 +637,23 @@
 [1.20.0]
 * Use base image v3
 
+[1.20.1]
+* Update Gitea to 1.13.3
+* Turn default hash password algorithm back to pbkdf2 from argon2 until we find a better one (#14673) (#14675)
+* Fix paging of file commit logs (#14831) (#14879)
+* Print useful error if SQLite is used in settings but not supported (#14476) (#14874)
+* Fix display since time round (#14226) (#14873)
+* When Deleting Repository only explicitly close PRs whose base is not this repository (#14823) (#14842)
+* Set HCaptchaSiteKey on Link Account pages (#14834) (#14839)
+* Fix a couple of CommentAsPatch issues. (#14804) (#14820)
+* Disable broken OAuth2 providers at startup (#14802) (#14811)
+* Repo Transfer permission checks (#14792) (#14794)
+* Fix double alert in oauth2 application edit view (#14764) (#14768)
+* Fix broken spans in diffs (#14678) (#14683)
+* Prevent race in PersistableChannelUniqueQueue.Has (#14651) (#14676)
+* HasPreviousCommit causes recursive load of commits unnecessarily (#14598) (#14649)
+* Do not assume all 40 char strings are SHA1s (#14624) (#14648)
+* Allow org labels to be set with issue templates (#14593) (#14647)
+* 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)
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 3d1cbf6..a63f8a2 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.0",
+  "version": "1.20.1",
   "healthCheckPath": "/healthcheck",
   "httpPort": 3000,
   "memoryLimit": 536870912,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 34ce01a..db6500f 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.13.2</upstream>
+This app packages Gitea <upstream>1.13.3</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
 
diff --git a/Dockerfile b/Dockerfile
index dbe5a68..3a5350b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
 
-ARG VERSION=1.13.2
-
 RUN apt-get update && \
     apt-get install -y openssh-server git && \
     rm -rf /etc/ssh_host_* && \
@@ -16,6 +14,9 @@ RUN passwd -d git
 
 RUN mkdir -p /home/git/gitea
 WORKDIR /home/git
+
+ARG VERSION=1.13.3
+
 RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
     && chmod +x /home/git/gitea/gitea