summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-09 11:24:14 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-09 11:24:14 -0500
commita4cce1023cae299a808875c00d6427003145da7d (patch)
tree2712fef5a2bb7787dc8e52cf3b2ae55d97309a5c /web/react/components/user_settings
parent63f830938b732258ea481f46076a88bfa8ebcd8c (diff)
parent8ac0e800f18167b711cacbdaa91c5013decb79bf (diff)
downloadchat-a4cce1023cae299a808875c00d6427003145da7d.tar.gz
chat-a4cce1023cae299a808875c00d6427003145da7d.tar.bz2
chat-a4cce1023cae299a808875c00d6427003145da7d.zip
Merge pull request #2113 from mattermost/slash-command-fixes
Multiple minor slash command fixes
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r--web/react/components/user_settings/user_settings_modal.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index e0b72157b..90f28822b 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -234,7 +234,7 @@ class UserSettingsModal extends React.Component {
tabs.push({name: 'developer', uiName: formatMessage(holders.developer), icon: 'glyphicon glyphicon-th'});
}
- if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true') {
+ if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true' || global.window.mm_config.EnableCommands === 'true') {
tabs.push({name: 'integrations', uiName: formatMessage(holders.integrations), icon: 'glyphicon glyphicon-transfer'});
}
tabs.push({name: 'display', uiName: formatMessage(holders.display), icon: 'glyphicon glyphicon-eye-open'});