Merge pull request #237 from mattermost/mm-1570

fixes mm-1570 adds support for using mattermost as an OAuth client

1 files changed, 12 insertions, 0 deletions

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 71fefff5b..05918650b 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -90,6 +90,17 @@ module.exports = React.createClass({
             focusEmail = true;
         }
 
+        var auth_services = JSON.parse(this.props.authServices);
+
+        var login_message;
+        if (auth_services.indexOf("gitlab") >= 0) {
+            login_message = (
+                <div className="form-group form-group--small">
+                    <span><a href={"/"+teamName+"/login/gitlab"}>{"Log in with GitLab"}</a></span>
+                </div>
+            );
+        }
+
         return (
             <div className="signup-team__container">
                 <div>
@@ -112,6 +123,7 @@ module.exports = React.createClass({
                     <div className="form-group">
                         <button type="submit" className="btn btn-primary">Sign in</button>
                     </div>
+                    { login_message }
                     <div className="form-group form-group--small">
                         <span><a href="/find_team">{"Find other " + strings.TeamPlural}</a></span>
                     </div>