From b1bb2a7a54e55af5e31435254a4154be85805e6b Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 29 Sep 2015 11:19:03 -0700
Subject: PLT-483 adding better help text

---
 web/react/components/admin_console/gitlab_settings.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'web/react/components/admin_console')

diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx
index 1e10c5592..a887967ea 100644
--- a/web/react/components/admin_console/gitlab_settings.jsx
+++ b/web/react/components/admin_console/gitlab_settings.jsx
@@ -202,7 +202,7 @@ export default class GitLabSettings extends React.Component {
                                 onChange={this.handleChange}
                                 disabled={!this.state.Allow}
                             />
-                            <p className='help-text'>{'Enter <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize).'}</p>
+                            <p className='help-text'>{'Enter <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize).  Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p>
                         </div>
                     </div>
 
@@ -224,7 +224,7 @@ export default class GitLabSettings extends React.Component {
                                 onChange={this.handleChange}
                                 disabled={!this.state.Allow}
                             />
-                            <p className='help-text'>{'Enter <your-gitlab-url>/oauth/token.'}</p>
+                            <p className='help-text'>{'Enter <your-gitlab-url>/oauth/token.   Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p>
                         </div>
                     </div>
 
@@ -246,7 +246,7 @@ export default class GitLabSettings extends React.Component {
                                 onChange={this.handleChange}
                                 disabled={!this.state.Allow}
                             />
-                            <p className='help-text'>{'Enter <your-gitlab-url>/api/v3/user.'}</p>
+                            <p className='help-text'>{'Enter <your-gitlab-url>/api/v3/user.  Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p>
                         </div>
                     </div>
 
-- 
cgit v1.2.3-1-g7c22


From 0e028d04e2d6442ee15e46c08d26686a2c2f7201 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 29 Sep 2015 11:20:16 -0700
Subject: PLT-429 removing scope field.

---
 .../components/admin_console/gitlab_settings.jsx   | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'web/react/components/admin_console')

diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx
index a887967ea..a0c024f08 100644
--- a/web/react/components/admin_console/gitlab_settings.jsx
+++ b/web/react/components/admin_console/gitlab_settings.jsx
@@ -40,7 +40,7 @@ export default class GitLabSettings extends React.Component {
         config.GitLabSettings.Allow = React.findDOMNode(this.refs.Allow).checked;
         config.GitLabSettings.Secret = React.findDOMNode(this.refs.Secret).value.trim();
         config.GitLabSettings.Id = React.findDOMNode(this.refs.Id).value.trim();
-        config.GitLabSettings.Scope = React.findDOMNode(this.refs.Scope).value.trim();
+        //config.GitLabSettings.Scope = React.findDOMNode(this.refs.Scope).value.trim();
         config.GitLabSettings.AuthEndpoint = React.findDOMNode(this.refs.AuthEndpoint).value.trim();
         config.GitLabSettings.TokenEndpoint = React.findDOMNode(this.refs.TokenEndpoint).value.trim();
         config.GitLabSettings.UserApiEndpoint = React.findDOMNode(this.refs.UserApiEndpoint).value.trim();
@@ -162,28 +162,6 @@ export default class GitLabSettings extends React.Component {
                         </div>
                     </div>
 
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='Scope'
-                        >
-                            {'Scope:'}
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='Scope'
-                                ref='Scope'
-                                placeholder='Not currently used by GitLab. Please leave blank'
-                                defaultValue={this.props.config.GitLabSettings.Scope}
-                                onChange={this.handleChange}
-                                disabled={!this.state.Allow}
-                            />
-                            <p className='help-text'>{'This field is not yet used by GitLab OAuth. Other OAuth providers may use this field to specify the scope of account data from OAuth provider that is sent to Mattermost.'}</p>
-                        </div>
-                    </div>
-
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'
@@ -272,6 +250,28 @@ export default class GitLabSettings extends React.Component {
     }
 }
 
+//  <div className='form-group'>
+//     <label
+//         className='control-label col-sm-4'
+//         htmlFor='Scope'
+//     >
+//         {'Scope:'}
+//     </label>
+//     <div className='col-sm-8'>
+//         <input
+//             type='text'
+//             className='form-control'
+//             id='Scope'
+//             ref='Scope'
+//             placeholder='Not currently used by GitLab. Please leave blank'
+//             defaultValue={this.props.config.GitLabSettings.Scope}
+//             onChange={this.handleChange}
+//             disabled={!this.state.Allow}
+//         />
+//         <p className='help-text'>{'This field is not yet used by GitLab OAuth. Other OAuth providers may use this field to specify the scope of account data from OAuth provider that is sent to Mattermost.'}</p>
+//     </div>
+// </div>
+
 GitLabSettings.propTypes = {
     config: React.PropTypes.object
 };
-- 
cgit v1.2.3-1-g7c22


From 80d1acab228b4fb8c16c0f81be8bd6655b30f8ca Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 29 Sep 2015 11:21:27 -0700
Subject: PLT-472 switching field ordering.

---
 .../components/admin_console/gitlab_settings.jsx   | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'web/react/components/admin_console')

diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx
index a0c024f08..f57affb90 100644
--- a/web/react/components/admin_console/gitlab_settings.jsx
+++ b/web/react/components/admin_console/gitlab_settings.jsx
@@ -40,7 +40,6 @@ export default class GitLabSettings extends React.Component {
         config.GitLabSettings.Allow = React.findDOMNode(this.refs.Allow).checked;
         config.GitLabSettings.Secret = React.findDOMNode(this.refs.Secret).value.trim();
         config.GitLabSettings.Id = React.findDOMNode(this.refs.Id).value.trim();
-        //config.GitLabSettings.Scope = React.findDOMNode(this.refs.Scope).value.trim();
         config.GitLabSettings.AuthEndpoint = React.findDOMNode(this.refs.AuthEndpoint).value.trim();
         config.GitLabSettings.TokenEndpoint = React.findDOMNode(this.refs.TokenEndpoint).value.trim();
         config.GitLabSettings.UserApiEndpoint = React.findDOMNode(this.refs.UserApiEndpoint).value.trim();
@@ -121,44 +120,44 @@ export default class GitLabSettings extends React.Component {
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'
-                            htmlFor='Secret'
+                            htmlFor='Id'
                         >
-                            {'Secret:'}
+                            {'Id:'}
                         </label>
                         <div className='col-sm-8'>
                             <input
                                 type='text'
                                 className='form-control'
-                                id='Secret'
-                                ref='Secret'
+                                id='Id'
+                                ref='Id'
                                 placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'
-                                defaultValue={this.props.config.GitLabSettings.Secret}
+                                defaultValue={this.props.config.GitLabSettings.Id}
                                 onChange={this.handleChange}
                                 disabled={!this.state.Allow}
                             />
-                            <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab.'}</p>
+                            <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab'}</p>
                         </div>
                     </div>
 
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'
-                            htmlFor='Id'
+                            htmlFor='Secret'
                         >
-                            {'Id:'}
+                            {'Secret:'}
                         </label>
                         <div className='col-sm-8'>
                             <input
                                 type='text'
                                 className='form-control'
-                                id='Id'
-                                ref='Id'
+                                id='Secret'
+                                ref='Secret'
                                 placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'
-                                defaultValue={this.props.config.GitLabSettings.Id}
+                                defaultValue={this.props.config.GitLabSettings.Secret}
                                 onChange={this.handleChange}
                                 disabled={!this.state.Allow}
                             />
-                            <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab'}</p>
+                            <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab.'}</p>
                         </div>
                     </div>
 
@@ -250,6 +249,8 @@ export default class GitLabSettings extends React.Component {
     }
 }
 
+
+//config.GitLabSettings.Scope = React.findDOMNode(this.refs.Scope).value.trim();
 //  <div className='form-group'>
 //     <label
 //         className='control-label col-sm-4'
-- 
cgit v1.2.3-1-g7c22