From e73e6db8ef2465a2a4b6de43acbe8eb1aea72e82 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 13 Feb 2019 09:28:14 +0100
Subject: [PATCH] Version bump and changelog for 0.18.2

---
 CHANGELOG                           | 21 +++++++++++++++++++++
 api/funkwhale_api/__init__.py       |  2 +-
 changes/changelog.d/694.bugfix      |  1 -
 changes/changelog.d/696.bugfix      |  1 -
 changes/changelog.d/697.bugfix      |  1 -
 changes/changelog.d/705.enhancement |  1 -
 changes/changelog.d/706.enhancement |  2 --
 changes/changelog.d/707.bugfix      |  1 -
 8 files changed, 22 insertions(+), 8 deletions(-)
 delete mode 100644 changes/changelog.d/694.bugfix
 delete mode 100644 changes/changelog.d/696.bugfix
 delete mode 100644 changes/changelog.d/697.bugfix
 delete mode 100644 changes/changelog.d/705.enhancement
 delete mode 100644 changes/changelog.d/706.enhancement
 delete mode 100644 changes/changelog.d/707.bugfix

diff --git a/CHANGELOG b/CHANGELOG
index 9cc7df63e..1dffe8e4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,27 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.18.2 (2019-02-13)
+-------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/index.html
+
+Enhancements:
+
+- Added a 'fix_federation_ids' management command to deal with protocol/domain issues in federation
+  IDs after deployments (#706)
+- Can now use a local file with FUNKWHALE_SPA_HTML_ROOT to avoid sending an HTTP request (#705)
+
+
+Bugfixes:
+
+- Downgraded channels dependency to 2.1.6 to fix denied uploads (#697)
+- Fixed cards display issues on medium/small screens (#707)
+- Fixed Embed component name that could lead to issue when developping on OSX (#696)
+- Fixed resizing issues for album cards on artist pages (#694)
+
+
 0.18.1 (2019-01-29)
 -------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index bc4976716..5038f371a 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.18.1"
+__version__ = "0.18.2"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/694.bugfix b/changes/changelog.d/694.bugfix
deleted file mode 100644
index 7dd6e45a9..000000000
--- a/changes/changelog.d/694.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed resizing issues for album cards on artist pages (#694)
diff --git a/changes/changelog.d/696.bugfix b/changes/changelog.d/696.bugfix
deleted file mode 100644
index 22a1c6aa4..000000000
--- a/changes/changelog.d/696.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed Embed component name that could lead to issue when developping on OSX (#696)
diff --git a/changes/changelog.d/697.bugfix b/changes/changelog.d/697.bugfix
deleted file mode 100644
index 66fe1ee9a..000000000
--- a/changes/changelog.d/697.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Downgraded channels dependency to 2.1.6 to fix denied uploads (#697)
diff --git a/changes/changelog.d/705.enhancement b/changes/changelog.d/705.enhancement
deleted file mode 100644
index 9f25c9cbd..000000000
--- a/changes/changelog.d/705.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Can now use a local file with FUNKWHALE_SPA_HTML_ROOT to avoid sending an HTTP request (#705)
diff --git a/changes/changelog.d/706.enhancement b/changes/changelog.d/706.enhancement
deleted file mode 100644
index 7ede46b98..000000000
--- a/changes/changelog.d/706.enhancement
+++ /dev/null
@@ -1,2 +0,0 @@
-Added a 'fix_federation_ids' management command to deal with protocol/domain issues in federation
-IDs after deployments (#706)
diff --git a/changes/changelog.d/707.bugfix b/changes/changelog.d/707.bugfix
deleted file mode 100644
index 3cd05c974..000000000
--- a/changes/changelog.d/707.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed cards display issues on medium/small screens (#707)
-- 
GitLab