From 21b3c7255ed26221d9bca4c66219e40fc07d5a40 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Sat, 7 May 2022 13:48:31 +0200
Subject: [PATCH] Version bump and changelog for 1.2.5

---
 CHANGELOG                            | 52 ++++++++++++++++++++++++++++
 CONTRIBUTING.rst                     |  4 +--
 api/funkwhale_api/__init__.py        |  2 +-
 changes/changelog.d/1319.enhancement |  1 -
 changes/changelog.d/1432.bugfix      |  1 -
 changes/changelog.d/1729.bugfix      |  1 -
 6 files changed, 55 insertions(+), 6 deletions(-)
 delete mode 100644 changes/changelog.d/1319.enhancement
 delete mode 100644 changes/changelog.d/1432.bugfix
 delete mode 100644 changes/changelog.d/1729.bugfix

diff --git a/CHANGELOG b/CHANGELOG
index 9483b5a54..aa1b2a746 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,58 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+1.2.5 (2022-05-07)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Enhancements:
+
+- Parameterize the default S3 ACL when uploading objects. (#1319)
+
+
+Bugfixes:
+
+- Fix stopped player to not show 00:00 when loading a track (#1432)
+- Fixes channel page (#1729) (1729)
+
+Committers:
+
+- Georg Krause
+- Marcos
+- MattDHarding
+- Stuart Begley-Miller
+
+Contributors to our Issues:
+
+- Agate
+- Beto Dealmeida
+- Cam Sweeney
+- Ciarán Ainsworth
+- Georg Krause
+- JuniorJPDJ
+- Marcos Peña
+- Mathieu Jourdan
+- MattDHarding
+- Micha Gläß-Stöcker
+- Stuart Begley-Miller
+- Tony Wasserka
+- jovuit
+- petitminion
+- pullopen
+
+Contributors to our Merge Requests:
+
+- Ciarán Ainsworth
+- Georg Krause
+- JuniorJPDJ
+- Marcos Peña
+- MattDHarding
+- PhieF
+- Stuart Begley-Miller
+- petitminion
+
 1.2.4 (2022-04-23)
 ------------------
 
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index db5e556ad..741f47a89 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -759,13 +759,13 @@ To make a new 3.4 release::
     git pull
 
     # compile changelog
-    towncrier --version $NEXT_RELEASE --yes
+    towncrier build --version $NEXT_RELEASE
 
     # polish changelog
     # - update the date
     # - look for typos
     # - add list of contributors via `python3 scripts/get-contributions-stats.py $NEXT_RELEASE`
-    git log $PREVIOUS_RELEASE.. --format="%aN" --reverse | sort | uniq  # Get all commit authors since last release
+    git log $PREVIOUS_RELEASE.. --format="- %aN" --reverse | sort | uniq  # Get all commit authors since last release
     nano CHANGELOG
 
     # Set the `__version__` variable to $NEXT_RELEASE
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 1e618c71a..4fa11ebad 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.2.4"
+__version__ = "1.2.5"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1319.enhancement b/changes/changelog.d/1319.enhancement
deleted file mode 100644
index 40a24231c..000000000
--- a/changes/changelog.d/1319.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Parameterize the default S3 ACL when uploading objects. (#1319)
diff --git a/changes/changelog.d/1432.bugfix b/changes/changelog.d/1432.bugfix
deleted file mode 100644
index c3abbfd59..000000000
--- a/changes/changelog.d/1432.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix stopped player to not show 00:00 when loading a track (#1432)
diff --git a/changes/changelog.d/1729.bugfix b/changes/changelog.d/1729.bugfix
deleted file mode 100644
index b7dd2b7c4..000000000
--- a/changes/changelog.d/1729.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes channel page (#1729) (1729)