From 73ced887fdd7ed494c61c43a034e36d139f7a02d Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Sun, 1 Aug 2021 21:53:51 +0200
Subject: [PATCH] Version bump and changelog for 1.1.3

---
 CHANGELOG                                     | 17 +++++++++++++++++
 api/funkwhale_api/__init__.py                 |  2 +-
 changes/changelog.d/1303.Bugfix               |  1 -
 changes/changelog.d/1427.bugfix               |  1 -
 changes/changelog.d/1489.bugfix               |  1 -
 changes/changelog.d/{1498.bug => 1498.bugfix} |  0
 6 files changed, 18 insertions(+), 4 deletions(-)
 delete mode 100644 changes/changelog.d/1303.Bugfix
 delete mode 100644 changes/changelog.d/1427.bugfix
 delete mode 100644 changes/changelog.d/1489.bugfix
 rename changes/changelog.d/{1498.bug => 1498.bugfix} (100%)

diff --git a/CHANGELOG b/CHANGELOG
index f1a7c02832..a42896a326 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,23 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+1.1.3 (unreleased)
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Enhancements:
+
+- Test better tagging of Docker Images (#1505)
+
+Bugfixes:
+
+- Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID (#1498)
+- Add worker-src to nginx header to prevent issues (#1489)
+- Only suggest typed tag once if it already exists
+- Implement access control on the moderation views (#1494)
+- Prevent open redirect on login (#1492)
+
+
 1.1.2 (2021-05-19)
 ------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 9efdef3c1a..2f679f824f 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.1.2"
+__version__ = "1.1.3"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1303.Bugfix b/changes/changelog.d/1303.Bugfix
deleted file mode 100644
index 9a77c1865c..0000000000
--- a/changes/changelog.d/1303.Bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix federation issues by increasing FUNKWHALE_WEB_WORKERS (#1303)
diff --git a/changes/changelog.d/1427.bugfix b/changes/changelog.d/1427.bugfix
deleted file mode 100644
index a017d9eb93..0000000000
--- a/changes/changelog.d/1427.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Only suggest typed tag once if it already exists
diff --git a/changes/changelog.d/1489.bugfix b/changes/changelog.d/1489.bugfix
deleted file mode 100644
index dd73b4205c..0000000000
--- a/changes/changelog.d/1489.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add worker-src to nginx header to prevent issues (#1489)
diff --git a/changes/changelog.d/1498.bug b/changes/changelog.d/1498.bugfix
similarity index 100%
rename from changes/changelog.d/1498.bug
rename to changes/changelog.d/1498.bugfix
-- 
GitLab