From 619e6d6400bb9794cf9c545fe18f7cb0e8ce5db7 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Thu, 5 Aug 2021 23:17:44 +0100
Subject: [PATCH] Frontport changelog for v1.14.6 (#16633)

* Frontport changelog for v1.14.6

Frontport #16619

Changelog frontported to below v1.15.0-rc1.

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Update config.yaml

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
---
 CHANGELOG.md     | 10 ++++++++++
 docs/config.yaml |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d20ad9d4d6..7168cb19d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -229,6 +229,16 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Remove utf8 option from installation page (#16126)
   * Use Wants= over Requires= in systemd file (#15897)
 
+## [1.14.6](https://github.com/go-gitea/gitea/releases/tag/v1.14.6) - 2021-08-04
+
+* SECURITY
+  * Bump github.com/markbates/goth from v1.67.1 to v1.68.0 (#16538) (#16540)
+  * Switch to maintained JWT lib (#16532) (#16535)
+  * Upgrade to latest version of golang-jwt (as forked for 1.14) (#16590) (#16607)
+* BUGFIXES
+  * Add basic edit ldap auth test & actually fix #16252 (#16465) (#16495)
+  * Make cancel from CatFileBatch and CatFileBatchCheck wait for the command to end (#16479) (#16481)
+
 ## [1.14.5](https://github.com/go-gitea/gitea/releases/tag/v1.14.5) - 2021-07-16
 
 * SECURITY
diff --git a/docs/config.yaml b/docs/config.yaml
index efe3cfbeea..2dfb4f81b6 100644
--- a/docs/config.yaml
+++ b/docs/config.yaml
@@ -18,7 +18,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://docs.gitea.io
-  version: 1.14.4
+  version: 1.14.6
   minGoVersion: 1.15
   goVersion: 1.16
   minNodeVersion: 12.17