diff options
author | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
commit | 028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch) | |
tree | 7366462741ae8f980f8066d1daa8166ae8a3c17b /web/react/components/team_signup_choose_auth.jsx | |
parent | 009982cd4514c6f0950138b15367df559c8f4dd2 (diff) | |
parent | 0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff) | |
download | chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2 chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip |
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/components/team_signup_choose_auth.jsx')
-rw-r--r-- | web/react/components/team_signup_choose_auth.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/team_signup_choose_auth.jsx b/web/react/components/team_signup_choose_auth.jsx index fa898f63c..0254c8b4e 100644 --- a/web/react/components/team_signup_choose_auth.jsx +++ b/web/react/components/team_signup_choose_auth.jsx @@ -8,7 +8,7 @@ export default class ChooseAuthPage extends React.Component { } render() { var buttons = []; - if (global.window.config.EnableSignUpWithGitLab === 'true') { + if (global.window.mm_config.EnableSignUpWithGitLab === 'true') { buttons.push( <a className='btn btn-custom-login gitlab btn-full' @@ -26,7 +26,7 @@ export default class ChooseAuthPage extends React.Component { ); } - if (global.window.config.EnableSignUpWithEmail === 'true') { + if (global.window.mm_config.EnableSignUpWithEmail === 'true') { buttons.push( <a className='btn btn-custom-login email btn-full' |