From 9320ee11ad232976a44f3208e0155fc556d01d44 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 2 Jan 2020 13:29:28 +0100
Subject: [PATCH] Bump version for 1.10.2

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

diff --git a/CHANGELOG b/CHANGELOG
index d92eb7e..4740757 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -419,4 +419,25 @@
 * Ensure Written is set in GZIP ProxyResponseWriter (#9018) (#9025)
 * Fix broken link to branch from issue list (#9003) (#9021)
 * Fix wrong system notice when repository is empty (#9020)
-* Shadow password correctly for session config (#8984) (#9002)
\ No newline at end of file
+* Shadow password correctly for session config (#8984) (#9002)
+
+[1.14.2]
+* Update Gitea to 1.10.2
+* Allow only specific Columns to be updated on Issue via API (#9539) (#9580)
+* Add ErrReactionAlreadyExist error (#9550) (#9564)
+* Fix bug when migrate from API (#8631) (#9563)
+* Use default avatar for ghost user (#9536) (#9537)
+* Fix repository issues pagination bug when there are more than one label filter (#9512) (#9528)
+* Fix deleted branch not removed when push the branch again (#9516) (#9524)
+* Fix missing repository status when migrating repository via API (#9511)
+* Trigger webhook when deleting a branch after merging a PR (#9510)
+* Fix paging on /repos/{owner}/{repo}/git/trees/{sha} API endpoint (#9482)
+* Fix NewCommitStatus (#9434) (#9435)
+* Use OriginalURL instead of CloneAddr in migration logging (#9418) (#9420)
+* Fix Slack webhook payload title generation to work with Mattermost (#9404)
+* DefaultBranch needs to be prefixed by BranchPrefix (#9356) (#9359)
+* Fix issue indexer not triggered when migrating a repository (#9333)
+* Fix bug that release attachment files not deleted when deleting repository (#9322) (#9329)
+* Fix migration releases (#9319) (#9326) (#9328)
+* Fix File Edit: Author/Committer interchanged (#9297) (#9300)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index d73232e..bfb12ed 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.14.1",
+  "version": "1.14.2",
   "healthCheckPath": "/healthcheck",
   "httpPort": 3000,
   "addons": {
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 9cf2c2b..116e65b 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.10.1</upstream>
+This app packages Gitea <upstream>1.10.2</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
 
diff --git a/Dockerfile b/Dockerfile
index d8b7d69..995051f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
 
-ARG VERSION=1.10.1
+ARG VERSION=1.10.2
 
 RUN apt-get update && \
     apt-get install -y openssh-server git && \