summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings.jsx
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-15 10:01:57 -0800
committerCorey Hulen <corey@hulen.com>2015-06-15 10:01:57 -0800
commit4335b21ee9cd41ff5693ab9c7aac957a799a3dfa (patch)
tree3d81171771dc03f129266a6083182912f1e94f68 /web/react/components/user_settings.jsx
parent85a26987ae6b951d9022b5d8d1c9e465b72b5b8f (diff)
parent4ba80e3b30c3d3e7fc6e214fbdfdd85553f470c9 (diff)
downloadchat-4335b21ee9cd41ff5693ab9c7aac957a799a3dfa.tar.gz
chat-4335b21ee9cd41ff5693ab9c7aac957a799a3dfa.tar.bz2
chat-4335b21ee9cd41ff5693ab9c7aac957a799a3dfa.zip
Merge pull request #3 from mattermost/mm-1237
fixes mm-1237 remove sessions and activity log from account settings
Diffstat (limited to 'web/react/components/user_settings.jsx')
-rw-r--r--web/react/components/user_settings.jsx5
1 files changed, 5 insertions, 0 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index b165a59ad..a9c2433f2 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -1126,6 +1126,9 @@ module.exports = React.createClass({
<NotificationsTab user={this.state.user} activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
</div>
);
+
+ /* Temporarily removing sessions and activity_log tabs
+
} else if (this.props.activeTab === 'sessions') {
return (
<div>
@@ -1138,6 +1141,8 @@ module.exports = React.createClass({
<AuditTab activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
</div>
);
+ */
+
} else if (this.props.activeTab === 'appearance') {
return (
<div>