From ea4be336d485cacadfe8b4b5b74c6aa56bd8120b Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Wed, 19 May 2021 15:30:51 +0200
Subject: [PATCH] Version bump and changelog for 1.1.2
---
CHANGELOG | 19 +++++++++++++++++++
api/funkwhale_api/__init__.py | 2 +-
changes/changelog.d/1160.bugfix | 1 -
changes/changelog.d/1296.enhancement | 1 -
changes/changelog.d/1442.bugfix | 1 -
changes/changelog.d/playable.bugfix | 1 -
6 files changed, 20 insertions(+), 5 deletions(-)
delete mode 100644 changes/changelog.d/1160.bugfix
delete mode 100644 changes/changelog.d/1296.enhancement
delete mode 100644 changes/changelog.d/1442.bugfix
delete mode 100644 changes/changelog.d/playable.bugfix
diff --git a/CHANGELOG b/CHANGELOG
index fac975a89d..f1a7c02832 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,25 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
.. towncrier
+1.1.2 (2021-05-19)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Enhancements:
+
+- Added modal to prompt users to log in when subscribing to channels (#1296)
+
+
+Bugfixes:
+
+- Added missing is_playable serializer for the tracks endpoint.
+- Fixed minor graphical bug where loaders would appear white in dark theme (#1442)
+- Fixed systemd unit for funkwhale-worker (#1160)
+- Several minor fixes for the Frontend
+
+
1.1.1 (2021-04-13)
------------------
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 8afc6a1d2e..9efdef3c1a 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-__version__ = "1.1.1"
+__version__ = "1.1.2"
__version_info__ = tuple(
[
int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1160.bugfix b/changes/changelog.d/1160.bugfix
deleted file mode 100644
index ba01f1114f..0000000000
--- a/changes/changelog.d/1160.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed systemd unit for funkwhale-worker (#1160)
diff --git a/changes/changelog.d/1296.enhancement b/changes/changelog.d/1296.enhancement
deleted file mode 100644
index 2df4117aae..0000000000
--- a/changes/changelog.d/1296.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added modal to prompt users to log in when subscribing to channels (#1296)
diff --git a/changes/changelog.d/1442.bugfix b/changes/changelog.d/1442.bugfix
deleted file mode 100644
index 685d3781dc..0000000000
--- a/changes/changelog.d/1442.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed minor graphical bug where loaders would appear white in dark theme (#1442)
diff --git a/changes/changelog.d/playable.bugfix b/changes/changelog.d/playable.bugfix
deleted file mode 100644
index 331ab84215..0000000000
--- a/changes/changelog.d/playable.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added missing is_playable serializer for the tracks endpoint.
--
GitLab