summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorit33 <iantien@gmail.com>2015-09-25 22:32:26 -0700
committerit33 <iantien@gmail.com>2015-09-25 22:32:26 -0700
commit5ca63153dc1fbadebae0a727c63ec18fbacff603 (patch)
tree78ff366e865e6804241b90bc889c3c3b785b10c2
parent1b5c32f8ab8fcbf84870fef5a717b85e1a3c90e8 (diff)
downloadchat-5ca63153dc1fbadebae0a727c63ec18fbacff603.tar.gz
chat-5ca63153dc1fbadebae0a727c63ec18fbacff603.tar.bz2
chat-5ca63153dc1fbadebae0a727c63ec18fbacff603.zip
Update gitlab_settings.jsx
-rw-r--r--web/react/components/admin_console/gitlab_settings.jsx16
1 files changed, 8 insertions, 8 deletions
diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx
index f76655b89..1e10c5592 100644
--- a/web/react/components/admin_console/gitlab_settings.jsx
+++ b/web/react/components/admin_console/gitlab_settings.jsx
@@ -114,7 +114,7 @@ export default class GitLabSettings extends React.Component {
/>
{'false'}
</label>
- <p className='help-text'>{'When true Mattermost will allow team creation and account signup utilizing GitLab OAuth.'}</p>
+ <p className='help-text'>{'When true, Mattermost allows team creation and account signup using GitLab OAuth. To configure, log in to your GitLab account and go to Applications -> Profile Settings. Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". Then use "Secret" and "Id" fields to complete the options below.'}</p>
</div>
</div>
@@ -136,7 +136,7 @@ export default class GitLabSettings extends React.Component {
onChange={this.handleChange}
disabled={!this.state.Allow}
/>
- <p className='help-text'>{'Need help text.'}</p>
+ <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab.'}</p>
</div>
</div>
@@ -158,7 +158,7 @@ export default class GitLabSettings extends React.Component {
onChange={this.handleChange}
disabled={!this.state.Allow}
/>
- <p className='help-text'>{'Need help text.'}</p>
+ <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab'}</p>
</div>
</div>
@@ -175,12 +175,12 @@ export default class GitLabSettings extends React.Component {
className='form-control'
id='Scope'
ref='Scope'
- placeholder='Ex ""'
+ 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'>{'Need help text.'}</p>
+ <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>
@@ -202,7 +202,7 @@ export default class GitLabSettings extends React.Component {
onChange={this.handleChange}
disabled={!this.state.Allow}
/>
- <p className='help-text'>{'Need help text.'}</p>
+ <p className='help-text'>{'Enter <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize).'}</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'>{'Need help text.'}</p>
+ <p className='help-text'>{'Enter <your-gitlab-url>/oauth/token.'}</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'>{'Need help text.'}</p>
+ <p className='help-text'>{'Enter <your-gitlab-url>/api/v3/user.'}</p>
</div>
</div>