summaryrefslogtreecommitdiffstats
path: root/webapp/components/login
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-07-08 09:17:07 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-07-08 09:17:07 -0400
commit59d5ae40abb7e2fc5c43f3079454cacf12703b98 (patch)
tree7c6f93fcbc7ba365176de62809d6a9dc5893c696 /webapp/components/login
parent25385c8c2a46b236d902959ac20cd9f44789eeb8 (diff)
downloadchat-59d5ae40abb7e2fc5c43f3079454cacf12703b98.tar.gz
chat-59d5ae40abb7e2fc5c43f3079454cacf12703b98.tar.bz2
chat-59d5ae40abb7e2fc5c43f3079454cacf12703b98.zip
PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled (#3524)
Diffstat (limited to 'webapp/components/login')
-rw-r--r--webapp/components/login/login_controller.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index ca06caf0b..d2dbf1800 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -484,7 +484,7 @@ export default class LoginController extends React.Component {
loginControls.push(
<a
className='btn btn-custom-login saml'
- key='gitlab'
+ key='saml'
href={'/login/sso/saml' + this.props.location.search}
>
<span>