hide integration management behind labs checkbox

src/components/structures/UserSettings.js

@@ -34,7 +34,11 @@ const LABS_FEATURES = [
     {
         name: 'End-to-End Encryption',
         id: 'e2e_encryption'
-    }
+    },
+    {
+        name: 'Integration Management',
+        id: 'integration_management'
+    },
 ];
 
 // if this looks like a release, use the 'version' from package.json; else use

src/components/views/rooms/RoomSettings.js

@@ -67,18 +67,14 @@ module.exports = React.createClass({
             tags_changed: false,
             tags: tags,
             areNotifsMuted: areNotifsMuted,
-<<<<<<< HEAD
-            isRoomPublished: this._originalIsRoomPublished, // loaded async in componentWillMount
-            scalar_token: null,
-            scalar_error: null,
-=======
             // isRoomPublished is loaded async in componentWillMount so when the component
             // inits, the saved value will always be undefined, however getInitialState()
             // is also called from the saving code so we must return the correct value here
             // if we have it (although this could race if the user saves before we load whether
             // the room is published or not).
             isRoomPublished: this._originalIsRoomPublished,
->>>>>>> develop
+            scalar_token: null,
+            scalar_error: null,
         };
     },
 
@@ -621,6 +617,7 @@ module.exports = React.createClass({
         }
 
         var integrations_section;
+        if (UserSettingsStore.isFeatureEnabled("integration_management")) {
             if (this.state.scalar_token) {
                 integrations_section = (
                     <div className="mx_RoomSettings_settings">
@@ -634,6 +631,7 @@ module.exports = React.createClass({
             } else {
                 integrations_section = <Loader />;
             }
+        }
 
         return (
             <div className="mx_RoomSettings">