From 8d16e4d7343d968b4cb332ac568e012c9adbc571 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Mon, 22 Apr 2019 11:51:14 -0700
Subject: [PATCH] Version 1.10.0

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

diff --git a/CHANGELOG b/CHANGELOG
index d62609f..eb9158a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -296,3 +296,16 @@
 * Prevent remote code execution vulnerability with mirror repo URL settings (#6593) (#6595)
 * Allow resend of confirmation email when logged in (#6482) (#6487)
 
+[1.10.0]
+* Update Gitea to 1.8.0
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.8.0)
+* Prevent remote code execution vulnerability with mirror repo URL settings (#6593) (#6594)
+* Resolve 2FA bypass on API (#6676) (#6674)
+* Prevent the creation of empty sessions for non-logged in users (#6690) (#6677)
+* Expose issue stopwatch toggling via API (#5970)
+* Pull request conflict files detection (#5951)
+* Implement "conversation lock" for issue comments (#5073)
+* Feature: Archive repos (#5009)
+* Allow to set organization visibility (public, internal, private) (#1763)
+* Added URL mapping for Release attachments like on github.com (#1707)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 1c7c3ed..70b87c7 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.9.6",
+  "version": "1.10.0",
   "healthCheckPath": "/healthcheck",
   "httpPort": 3000,
   "addons": {
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index c3d1a43..681b870 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.7.6</upstream>
+This app packages Gitea <upstream>1.8.0</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.