summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-09-17 07:53:02 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-09-17 07:53:02 -0400
commitfd3a7afb3e746b8f57af9cdbe03393cd41bd03d4 (patch)
treec76453af3238ea7c5fcb81c67a3661f416c38dd8 /web
parent936f032ec45e4e1285b1d8e1bf5ba578fb2178b5 (diff)
parentce19b3c21197b57267804790c749769d2ddd1035 (diff)
downloadchat-fd3a7afb3e746b8f57af9cdbe03393cd41bd03d4.tar.gz
chat-fd3a7afb3e746b8f57af9cdbe03393cd41bd03d4.tar.bz2
chat-fd3a7afb3e746b8f57af9cdbe03393cd41bd03d4.zip
Merge pull request #702 from mattermost/oauth-switch-fix
Properly check if OAuth providing is enabled on the client.
Diffstat (limited to 'web')
-rw-r--r--web/react/components/user_settings_modal.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings_modal.jsx b/web/react/components/user_settings_modal.jsx
index 1daf6ebb9..67a4d0041 100644
--- a/web/react/components/user_settings_modal.jsx
+++ b/web/react/components/user_settings_modal.jsx
@@ -35,7 +35,7 @@ export default class UserSettingsModal extends React.Component {
tabs.push({name: 'security', uiName: 'Security', icon: 'glyphicon glyphicon-lock'});
tabs.push({name: 'notifications', uiName: 'Notifications', icon: 'glyphicon glyphicon-exclamation-sign'});
tabs.push({name: 'appearance', uiName: 'Appearance', icon: 'glyphicon glyphicon-wrench'});
- if (global.window.config.EnableOAuthServiceProvider) {
+ if (global.window.config.EnableOAuthServiceProvider === 'true') {
tabs.push({name: 'developer', uiName: 'Developer', icon: 'glyphicon glyphicon-th'});
}