summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings_security.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-28 07:53:34 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-28 07:53:34 -0400
commit84f9c018e5e990676e45572ea4dcdd08ffa73f1d (patch)
tree35a88fc14f571f9a3e0fa0393fb84fce510f7be8 /webapp/components/user_settings/user_settings_security.jsx
parent7a25f2a78bc3afdaa7c55be5da66f3afa0fc965d (diff)
parent105333412e7fb95c3ce43958207bad922fc48cbb (diff)
downloadchat-84f9c018e5e990676e45572ea4dcdd08ffa73f1d.tar.gz
chat-84f9c018e5e990676e45572ea4dcdd08ffa73f1d.tar.bz2
chat-84f9c018e5e990676e45572ea4dcdd08ffa73f1d.zip
Merge pull request #2532 from mattermost/ldap-switch-fix
Minor fix to let Sign-in Method settings show up when ldap is enabled
Diffstat (limited to 'webapp/components/user_settings/user_settings_security.jsx')
-rw-r--r--webapp/components/user_settings/user_settings_security.jsx1
1 files changed, 1 insertions, 0 deletions
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx
index 283d2c425..f937844ec 100644
--- a/webapp/components/user_settings/user_settings_security.jsx
+++ b/webapp/components/user_settings/user_settings_security.jsx
@@ -416,6 +416,7 @@ class SecurityTab extends React.Component {
let numMethods = 0;
numMethods = global.window.mm_config.EnableSignUpWithGitLab === 'true' ? numMethods + 1 : numMethods;
numMethods = global.window.mm_config.EnableSignUpWithGoogle === 'true' ? numMethods + 1 : numMethods;
+ numMethods = global.window.mm_config.EnableLdap === 'true' ? numMethods + 1 : numMethods;
if (global.window.mm_config.EnableSignUpWithEmail && numMethods > 0) {
signInSection = this.createSignInSection();