From 27ad1ebda01857a74d8a916416e98d48616c64d8 Mon Sep 17 00:00:00 2001
From: Timo <16718859+toger5@users.noreply.github.com>
Date: Tue, 11 Jan 2022 13:23:32 +0100
Subject: [PATCH 1/3] Remove maximised widget feature docs (#20481)

---
 docs/labs.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docs/labs.md b/docs/labs.md
index 9a61bea742..cf6240ce8f 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -139,13 +139,6 @@ entirely incomplete and may not work at all - it is not recommended for general
 Bug reports, feature requests, etc are not currently accepted for this feature flag. A later stage of
 development will provide opportunities for feedback.
 
-## Maximised widgets (`feature_maximised_widgets`) [In Development]
-
-Maximised widgets provide a room layout in which a widget is (temporarily) the primary focus of the room. The whole chat area is then used for the widget. The chat is moved into the right panel.
-
-Note that this feature is currently under active development and therefore is
-entirely incomplete and may not work at all - it is not recommended for general use at this time.
-
 ## Metaspaces (`feature_spaces_metaspaces`) [In Development]
 
 Metaspaces are automatically populated spaces you can enable in your Space panel.

From 6c1fc8e903066d7fce3fb9f8b6f5609f9059ec4c Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 11 Jan 2022 12:48:49 +0000
Subject: [PATCH 2/3] Disable Git interactive auth when fetching deps (#20484)

This is important for branch testing, especially via HTTPS.
---
 scripts/fetch-develop.deps.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
index 0d999048dd..65159d1a1b 100755
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -25,7 +25,8 @@ function clone() {
     if [ -n "$branch" ]
     then
         echo "Trying to use $org/$repo#$branch"
-        git clone https://github.com/$org/$repo.git $repo --branch $branch \
+        # Disable auth prompts: https://serverfault.com/a/665959
+        GIT_TERMINAL_PROMPT=0 git clone https://github.com/$org/$repo.git $repo --branch $branch \
             "${GIT_CLONE_ARGS[@]}"
         return $?
     fi

From 8a9f677a76fdedf70e275287b3498e794be3c3a5 Mon Sep 17 00:00:00 2001
From: Germain <germains@element.io>
Date: Tue, 11 Jan 2022 12:58:55 +0000
Subject: [PATCH 3/3] Fix app tests for new startClient method (#20482)

---
 test/app-tests/joining-test.tsx | 1 +
 test/app-tests/loading-test.tsx | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/test/app-tests/joining-test.tsx b/test/app-tests/joining-test.tsx
index b5601875b9..2dfaa293b0 100644
--- a/test/app-tests/joining-test.tsx
+++ b/test/app-tests/joining-test.tsx
@@ -77,6 +77,7 @@ describe('joining a room', function() {
             const ROOM_ALIAS = '#alias:localhost';
             const ROOM_ID = '!id:localhost';
 
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
             httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
 
diff --git a/test/app-tests/loading-test.tsx b/test/app-tests/loading-test.tsx
index d2c7697c7b..bbf8f718b3 100644
--- a/test/app-tests/loading-test.tsx
+++ b/test/app-tests/loading-test.tsx
@@ -313,6 +313,7 @@ describe('loading:', function() {
         });
 
         it('shows the last known room by default', function() {
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities: {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
 
             loadApp();
@@ -332,6 +333,7 @@ describe('loading:', function() {
         it('shows a home page by default if we have no joined rooms', function() {
             localStorage.removeItem("mx_last_room_id");
 
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
 
             loadApp();
@@ -349,6 +351,7 @@ describe('loading:', function() {
         });
 
         it('shows a room view if we followed a room link', function() {
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
 
             loadApp({
@@ -663,6 +666,7 @@ describe('loading:', function() {
             // Wait for another trip around the event loop for the UI to update
             return sleep(1);
         }).then(() => {
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
             return expectAndAwaitSync().catch((e) => {
                 throw new Error("Never got /sync after login: did the client start?");