From ed9a2da83b3b77e7dd0314eaa92082ac8a2a9a9c Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 21 Sep 2015 15:11:56 -0700 Subject: Adding email to admin console --- web/react/components/login.jsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'web/react/components/login.jsx') diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index ffc07a4dd..cb7bc8835 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -95,10 +95,8 @@ export default class Login extends React.Component { focusEmail = true; } - const authServices = JSON.parse(this.props.authServices); - let loginMessage = []; - if (authServices.indexOf(Constants.GITLAB_SERVICE) !== -1) { + if (global.window.config.AllowSignUpWithGitLab) { loginMessage.push(
@@ -206,10 +204,8 @@ export default class Login extends React.Component { Login.defaultProps = { teamName: '', teamDisplayName: '', - authServices: '' }; Login.propTypes = { teamName: React.PropTypes.string, teamDisplayName: React.PropTypes.string, - authServices: React.PropTypes.string }; -- cgit v1.2.3-1-g7c22 From e863096358dd64ecf2de6efeec3db132cdc8d6b9 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 21 Sep 2015 15:34:09 -0700 Subject: Fixing broken signup pages --- web/react/components/login.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web/react/components/login.jsx') diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index cb7bc8835..72fae9149 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -96,7 +96,7 @@ export default class Login extends React.Component { } let loginMessage = []; - if (global.window.config.AllowSignUpWithGitLab) { + if (global.window.config.AllowSignUpWithGitLab === 'true') { loginMessage.push(
-- cgit v1.2.3-1-g7c22 From f8e2a43d09b4c2ec95e9565f9e62281226a1677d Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 21 Sep 2015 17:52:30 -0700 Subject: Fixing eslint errors --- web/react/components/login.jsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'web/react/components/login.jsx') diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 72fae9149..b12c5d988 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -5,7 +5,6 @@ const Utils = require('../utils/utils.jsx'); const Client = require('../utils/client.jsx'); const UserStore = require('../stores/user_store.jsx'); const BrowserStore = require('../stores/browser_store.jsx'); -const Constants = require('../utils/constants.jsx'); export default class Login extends React.Component { constructor(props) { @@ -203,9 +202,9 @@ export default class Login extends React.Component { Login.defaultProps = { teamName: '', - teamDisplayName: '', + teamDisplayName: '' }; Login.propTypes = { teamName: React.PropTypes.string, - teamDisplayName: React.PropTypes.string, + teamDisplayName: React.PropTypes.string }; -- cgit v1.2.3-1-g7c22 From 88e5a71e8c93b495cedaa07931a4f8052d9f12ed Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 22 Sep 2015 12:12:50 -0700 Subject: Adding service settings to admin console --- web/react/components/login.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web/react/components/login.jsx') diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index b12c5d988..8cc4f1483 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -95,7 +95,7 @@ export default class Login extends React.Component { } let loginMessage = []; - if (global.window.config.AllowSignUpWithGitLab === 'true') { + if (global.window.config.EnableSignUpWithGitLab === 'true') { loginMessage.push(
-- cgit v1.2.3-1-g7c22