gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6347 from vector-im/luke/feature-tag-panel-out-of-labs 

Take TagPanel out of labs
This commit is contained in:
David Baker 2018-03-19 14:49:29 +00:00 committed by GitHub
parent 202ada7c23 f5a58258f9
commit b4020bb715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/LeftPanel.js
View File

@ -193,9 +193,7 @@ var LeftPanel = React.createClass({
}, },
); );
const tagPanelEnabled = const tagPanelEnabled = !SettingsStore.getValue("TagPanel.disableTagPanel");
SettingsStore.isFeatureEnabled("feature_tag_panel") &&
!SettingsStore.getValue("TagPanel.disableTagPanel");
const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />; const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;
const containerClasses = classNames( const containerClasses = classNames(