From 0a88d419c6fc2143bd51874811ee21c841e9fd53 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 1 Oct 2018 17:21:01 +0200
Subject: [PATCH 1/3] allow non-ff merge from release branch into master

---
 release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index ab2eae788..0f4ab4086 100755
--- a/release.sh
+++ b/release.sh
@@ -281,7 +281,7 @@ fi
 echo "updating master branch"
 git checkout master
 git pull
-git merge --ff-only "$rel_branch"
+git merge "$rel_branch"
 
 # push master  and docs (if generated) to github
 git push origin master

From bd2da08c4eedfd6f90d3ea512692a5eeb45c125e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 2 Oct 2018 16:48:27 +0100
Subject: [PATCH 2/3] Reject with the actual error on indexeddb error

Rather than the event
---
 src/store/indexeddb-local-backend.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/indexeddb-local-backend.js b/src/store/indexeddb-local-backend.js
index e0ada7904..e3ae1c1ae 100644
--- a/src/store/indexeddb-local-backend.js
+++ b/src/store/indexeddb-local-backend.js
@@ -83,7 +83,7 @@ function txnAsPromise(txn) {
             resolve(event);
         };
         txn.onerror = function(event) {
-            reject(event);
+            reject(event.target.error);
         };
     });
 }
@@ -94,7 +94,7 @@ function reqAsEventPromise(req) {
             resolve(event);
         };
         req.onerror = function(event) {
-            reject(event);
+            reject(event.target.error);
         };
     });
 }

From 264b20535e8759314647d60b881299006679978f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 5 Oct 2018 12:13:05 +0100
Subject: [PATCH 3/3] Silence bluebird warnings

---
 src/client.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/client.js b/src/client.js
index d5923ee0e..577cf5ba8 100644
--- a/src/client.js
+++ b/src/client.js
@@ -46,6 +46,9 @@ import ReEmitter from './ReEmitter';
 import RoomList from './crypto/RoomList';
 import {InvalidStoreError} from './errors';
 
+// Disable warnings for now: we use deprecated bluebird functions
+// and need to migrate, but they spam the console with warnings.
+Promise.config({warnings: false});
 
 const LAZY_LOADING_MESSAGES_FILTER = {
     lazy_load_members: true,