From 366fb5f30f5d72e60f23f351bacec85c6f8f69c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Pe=C3=B1a?= <marcos.penia@gamco.es>
Date: Mon, 4 Jul 2022 17:03:19 +0200
Subject: [PATCH] Version bump and changelog for 1.2.6

---
 CHANGELOG                                  | 52 ++++++++++++++++++++++
 api/funkwhale_api/__init__.py              |  2 +-
 changes/changelog.d/1263.bugfix            |  1 -
 changes/changelog.d/1312.bugfix            |  1 -
 changes/changelog.d/1373.bugfix            |  1 -
 changes/changelog.d/1714.bugfix            |  1 -
 changes/changelog.d/1773.bugfix            |  1 -
 changes/changelog.d/1791.bugfix            |  1 -
 changes/changelog.d/funkwhale-support.misc |  1 -
 9 files changed, 53 insertions(+), 8 deletions(-)
 delete mode 100644 changes/changelog.d/1263.bugfix
 delete mode 100644 changes/changelog.d/1312.bugfix
 delete mode 100644 changes/changelog.d/1373.bugfix
 delete mode 100644 changes/changelog.d/1714.bugfix
 delete mode 100644 changes/changelog.d/1773.bugfix
 delete mode 100644 changes/changelog.d/1791.bugfix
 delete mode 100644 changes/changelog.d/funkwhale-support.misc

diff --git a/CHANGELOG b/CHANGELOG
index aa1b2a746..ede525489 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.6 (2022-07-04)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Bugfixes:
+
+- Channel overview was displaying foreign tracks (#1773)
+- Fixed login form focusing reset password link instead of next input (#1373)
+- Fixed missing album contextual menu (#1791)
+- Fixed single listening submission when repeating a song (#1312)
+- Fixed subsonic createPlaylist's endpoint doesn't update playlist (#1263)
+- Resolve timeouts if nodeinfo and service actor is not known (#1714)
+
+
+Other:
+
+- Replaced references to #funkwhale-troubleshooting with #funkwhale-support
+
+Committers:
+
+- Georg Krause
+- Marcos Peña
+- Petitminion
+- wvffle
+
+Contributors to our Issues:
+
+- jeweet
+- wvffle
+- Georg Krause
+- Marcos Peña
+- AMoonRabbit
+- Micha Gläß-Stöcker
+- Ciarán Ainsworth
+- heyarne
+- Agate
+- JuniorJPDJ
+- MichaelBechHansen
+- ooZberg
+- Esras .
+- PhieF
+- Petitminion
+
+Contributors to our Merge Requests:
+
+- wvffle
+- Georg Krause
+- Marcos Peña
+- Petitminion
+
 1.2.5 (2022-05-07)
 ------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 4fa11ebad..ca39fe0ce 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.2.5"
+__version__ = "1.2.6"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1263.bugfix b/changes/changelog.d/1263.bugfix
deleted file mode 100644
index 55d71c9f8..000000000
--- a/changes/changelog.d/1263.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes subsonic createPlaylist's endpoint doesn't update playlist (#1263) (1263)
diff --git a/changes/changelog.d/1312.bugfix b/changes/changelog.d/1312.bugfix
deleted file mode 100644
index d1c9fbbb1..000000000
--- a/changes/changelog.d/1312.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed single listening submission when repeating a song (#1312)
diff --git a/changes/changelog.d/1373.bugfix b/changes/changelog.d/1373.bugfix
deleted file mode 100644
index bc6a96540..000000000
--- a/changes/changelog.d/1373.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix login form focusing reset password link instead of next input (#1373)
diff --git a/changes/changelog.d/1714.bugfix b/changes/changelog.d/1714.bugfix
deleted file mode 100644
index 164c2fc77..000000000
--- a/changes/changelog.d/1714.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Resolve timeouts if nodeinfo and service actor is not known (#1714)
\ No newline at end of file
diff --git a/changes/changelog.d/1773.bugfix b/changes/changelog.d/1773.bugfix
deleted file mode 100644
index 73be673d4..000000000
--- a/changes/changelog.d/1773.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Channel overview was displaying foreign tracks (#1773) (1773)
diff --git a/changes/changelog.d/1791.bugfix b/changes/changelog.d/1791.bugfix
deleted file mode 100644
index f59a1bcb6..000000000
--- a/changes/changelog.d/1791.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed missing album contextual menu (#1791) (1791)
diff --git a/changes/changelog.d/funkwhale-support.misc b/changes/changelog.d/funkwhale-support.misc
deleted file mode 100644
index 66ead41c3..000000000
--- a/changes/changelog.d/funkwhale-support.misc
+++ /dev/null
@@ -1 +0,0 @@
-Replaced references to #funkwhale-troubleshooting with #funkwhale-support