From fe0e2b6ef8b26fe438410f7e6fa394989f833eeb Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Sun, 1 Aug 2021 22:01:58 +0200
Subject: [PATCH 1/5] Delete broken eslint config

---
 front/.eslintrc.js | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 front/.eslintrc.js

diff --git a/front/.eslintrc.js b/front/.eslintrc.js
deleted file mode 100644
index 64de441fc..000000000
--- a/front/.eslintrc.js
+++ /dev/null
@@ -1,24 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es6: true
-  },
-  extends: [
-    'plugin:vue/recommended',
-    'standard'
-  ],
-  globals: {
-    Atomics: 'readonly',
-    SharedArrayBuffer: 'readonly'
-  },
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module',
-    parser: 'babel-eslint'
-  },
-  plugins: [
-    'vue'
-  ],
-  rules: {
-  }
-}

From 079a802c92dd5f68b7420e3f8379888719f988c6 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Sun, 1 Aug 2021 22:04:02 +0200
Subject: [PATCH 2/5] Delete already processed changelog snippet

---
 changes/changelog.d/1498.bugfix | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 changes/changelog.d/1498.bugfix

diff --git a/changes/changelog.d/1498.bugfix b/changes/changelog.d/1498.bugfix
deleted file mode 100644
index 5290c9e2a..000000000
--- a/changes/changelog.d/1498.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID (#1498)

From 69734252f1a6c2b24a0f8454149c418135b4aab4 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Mon, 2 Aug 2021 10:37:01 +0200
Subject: [PATCH 3/5] Add release date for 1.1.3

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index a42896a32..12f78c2c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,7 +10,7 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
-1.1.3 (unreleased)
+1.1.3 (2021-08-02)
 Upgrade instructions are available at
 https://docs.funkwhale.audio/admin/upgrading.html
 

From a9095d3243cf75e7f907fb9189ea3c7728e86b60 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Tue, 6 Jul 2021 11:43:40 +0200
Subject: [PATCH 4/5] Pin asgiref version

---
 api/requirements/base.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/requirements/base.txt b/api/requirements/base.txt
index 09c13d9b5..8f6bb3e45 100644
--- a/api/requirements/base.txt
+++ b/api/requirements/base.txt
@@ -75,3 +75,4 @@ watchdog~=1.0.2
 
 ## Pin third party dependency to avoid issue with latest version
 twisted==20.3.0
+asgiref==3.3.4

From 3c8c15246010cfe77707b80e4519bbaa83a7fd7f Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Mon, 2 Aug 2021 20:47:50 +0200
Subject: [PATCH 5/5] Version bump and changelog for 1.1.4

---
 CHANGELOG                     | 6 ++++++
 api/funkwhale_api/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 12f78c2c8..261116f79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,12 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+1.1.4 (2021-08-02)
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+- Pinned version of asgiref to avoid trouble with latest release. For further information, see #1516
+
 1.1.3 (2021-08-02)
 Upgrade instructions are available at
 https://docs.funkwhale.audio/admin/upgrading.html
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 2f679f824..43540af4c 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num