From b4038287915ae1c4055f1021ca436b57956c6d68 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 18 Jul 2019 10:46:19 +0100
Subject: [PATCH 1/2] Remove edits feature flag from docs and config

Part of https://github.com/vector-im/riot-web/issues/10282
---
 config.sample.json               | 3 +--
 docs/labs.md                     | 7 -------
 electron_app/riot.im/config.json | 3 +--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/config.sample.json b/config.sample.json
index 55bf12c36f..f0b85bbcac 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -23,8 +23,7 @@
     "features": {
         "feature_groups": "labs",
         "feature_pinning": "labs",
-        "feature_reactions": "labs",
-        "feature_message_editing": "labs"
+        "feature_reactions": "labs"
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/docs/labs.md b/docs/labs.md
index 3d568a2b85..65b71b3466 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -35,11 +35,4 @@ That's it. Now should see your new counter under the header.
 reactions from other people. This feature is currently under active development,
 and only portions have been implemented so far.
 
-## Message editing
-
-`feature_message_editing` allows editing messages after they have been sent,
-accessible from the reaction/context bar when hovering a message.
-This feature is currently under active development,
-and only portions have been implemented so far.
-
 [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index e24d8ecf0d..27311da272 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -31,8 +31,7 @@
     },
     "features": {
         "feature_lazyloading": "enable",
-        "feature_reactions": "enable",
-        "feature_message_editing": "enable"
+        "feature_reactions": "enable"
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false

From 06ce10b3515c234832928dfb89ca0834e3fd027b Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 18 Jul 2019 10:48:43 +0100
Subject: [PATCH 2/2] Remove reactions feature flag from docs and config

Part of https://github.com/vector-im/riot-web/issues/10282
---
 config.sample.json               | 3 +--
 docs/labs.md                     | 6 ------
 electron_app/riot.im/config.json | 3 +--
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/config.sample.json b/config.sample.json
index f0b85bbcac..7e26d20059 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -22,8 +22,7 @@
     "showLabsSettings": false,
     "features": {
         "feature_groups": "labs",
-        "feature_pinning": "labs",
-        "feature_reactions": "labs"
+        "feature_pinning": "labs"
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/docs/labs.md b/docs/labs.md
index 65b71b3466..579bb1e113 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -29,10 +29,4 @@ Once enabled, send a custom state event to a room to set values:
 
 That's it. Now should see your new counter under the header.
 
-## Reactions
-
-`feature_reactions` allows reacting to messages with emoji and displaying
-reactions from other people. This feature is currently under active development,
-and only portions have been implemented so far.
-
 [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index 27311da272..a995a4e9e3 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -30,8 +30,7 @@
         }
     },
     "features": {
-        "feature_lazyloading": "enable",
-        "feature_reactions": "enable"
+        "feature_lazyloading": "enable"
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false