From aa1330a1ee2bc2c42b2cfe9fb7200310d9daffd0 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Tue, 23 Jan 2018 15:04:31 -0300
Subject: [PATCH] Fix GitLab login option (#1374)

---
 app/screens/login_options/index.js         |  3 +-
 app/screens/login_options/login_options.js | 45 +++++++++-------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/app/screens/login_options/index.js b/app/screens/login_options/index.js
index 777cb58de..3c57febd7 100644
--- a/app/screens/login_options/index.js
+++ b/app/screens/login_options/index.js
@@ -8,11 +8,10 @@ import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import LoginOptions from './login_options';
 
 function mapStateToProps(state) {
-    const {config, license, serverVersion} = state.entities.general;
+    const {config, license} = state.entities.general;
     return {
         config,
         license,
-        serverVersion,
         theme: getTheme(state)
     };
 }
diff --git a/app/screens/login_options/login_options.js b/app/screens/login_options/login_options.js
index 068d23315..7a8de21d8 100644
--- a/app/screens/login_options/login_options.js
+++ b/app/screens/login_options/login_options.js
@@ -12,7 +12,6 @@ import {
 } from 'react-native';
 import Button from 'react-native-button';
 import Orientation from 'react-native-orientation';
-import semver from 'semver';
 
 import {ViewTypes} from 'app/constants';
 import FormattedText from 'app/components/formatted_text';
@@ -30,7 +29,6 @@ class LoginOptions extends PureComponent {
         navigator: PropTypes.object,
         config: PropTypes.object.isRequired,
         license: PropTypes.object.isRequired,
-        serverVersion: PropTypes.string.isRequired,
         theme: PropTypes.object
     };
 
@@ -163,35 +161,30 @@ class LoginOptions extends PureComponent {
     };
 
     renderGitlabOption = () => {
-        const {config, serverVersion} = this.props;
+        const {config} = this.props;
 
         const forceHideFromLocal = LocalConfig.HideGitLabLoginExperimental;
 
-        const match = serverVersion.match(/^[0-9]*.[0-9]*.[0-9]*(-[a-zA-Z0-9.-]*)?/g);
-        if (match) {
-            const version = match[0];
-            if (!forceHideFromLocal && config.EnableSignUpWithGitLab === 'true' && semver.valid(version) && semver.gte(version, 'v3.10.0')) {
-                return (
-                    <Button
-                        key='gitlab'
-                        onPress={() => preventDoubleTap(this.goToSSO, this, ViewTypes.GITLAB)}
-                        containerStyle={[GlobalStyles.signupButton, {backgroundColor: '#548'}]}
+        if (!forceHideFromLocal && config.EnableSignUpWithGitLab === 'true') {
+            return (
+                <Button
+                    key='gitlab'
+                    onPress={() => preventDoubleTap(this.goToSSO, this, ViewTypes.GITLAB)}
+                    containerStyle={[GlobalStyles.signupButton, {backgroundColor: '#548'}]}
+                >
+                    <Image
+                        source={gitlab}
+                        style={{height: 18, marginRight: 5, width: 18}}
+                    />
+                    <Text
+                        style={[GlobalStyles.signupButtonText, {color: 'white'}]}
                     >
-                        <Image
-                            source={gitlab}
-                            style={{height: 18, marginRight: 5, width: 18}}
-                        />
-                        <Text
-                            style={[GlobalStyles.signupButtonText, {color: 'white'}]}
-                        >
-                            {'GitLab'}
-                        </Text>
-                    </Button>
-                );
-            }
-
-            return null;
+                        {'GitLab'}
+                    </Text>
+                </Button>
+            );
         }
+
         return null;
     };