From 0fffeda85f63266e15db4521bd1e59ee9a70e90f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 24 Apr 2020 09:59:05 -0600 Subject: [PATCH 1/2] Remove invite only padlocks feature flag config See https://github.com/matrix-org/matrix-react-sdk/pull/4487 --- riot.im/nightly/config.json | 1 - 1 file changed, 1 deletion(-) diff --git a/riot.im/nightly/config.json b/riot.im/nightly/config.json index 2610a72..776fc25 100644 --- a/riot.im/nightly/config.json +++ b/riot.im/nightly/config.json @@ -22,7 +22,6 @@ "feature_mjolnir": "labs", "feature_dm_verification": "labs", "feature_cross_signing": "enable", - "feature_invite_only_padlocks": "enable", "feature_bridge_state": "labs", "feature_presence_in_room_list": "labs", "feature_custom_themes": "labs" From ea9f097d1c67bc61f3a201ad27b2066fa071649c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 24 Apr 2020 10:18:11 -0600 Subject: [PATCH 2/2] Remove cross-signing feature flag because it's not a feature It's a setting, but we don't want to disable it. --- riot.im/nightly/config.json | 1 - riot.im/release/config.json | 3 --- 2 files changed, 4 deletions(-) diff --git a/riot.im/nightly/config.json b/riot.im/nightly/config.json index 776fc25..eca0371 100644 --- a/riot.im/nightly/config.json +++ b/riot.im/nightly/config.json @@ -21,7 +21,6 @@ "feature_many_integration_managers": "labs", "feature_mjolnir": "labs", "feature_dm_verification": "labs", - "feature_cross_signing": "enable", "feature_bridge_state": "labs", "feature_presence_in_room_list": "labs", "feature_custom_themes": "labs" diff --git a/riot.im/release/config.json b/riot.im/release/config.json index 1c78826..9342151 100644 --- a/riot.im/release/config.json +++ b/riot.im/release/config.json @@ -23,9 +23,6 @@ "siteId": 1, "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy" }, - "features": { - "feature_cross_signing": "enable" - }, "enable_presence_by_hs_url": { "https://matrix.org": false, "https://matrix-client.matrix.org": false