Commit 885ef494 authored by Evan Read's avatar Evan Read

Merge branch 'docs-gitlab-restart-step' into 'master'

Clarify final reconfigure/restart steps for GitLab integration

See merge request gitlab-org/gitlab!50687
parents 6608495d 3f974353
...@@ -75,15 +75,20 @@ GitLab.com generates an application ID and secret key for you to use. ...@@ -75,15 +75,20 @@ GitLab.com generates an application ID and secret key for you to use.
args: { scope: 'api' } } args: { scope: 'api' } }
``` ```
1. Change 'YOUR_APP_ID' to the Application ID from the GitLab.com application page. 1. Change `'YOUR_APP_ID'` to the Application ID from the GitLab.com application page.
1. Change 'YOUR_APP_SECRET' to the secret from the GitLab.com application page. 1. Change `'YOUR_APP_SECRET'` to the secret from the GitLab.com application page.
1. Save the configuration file. 1. Save the configuration file.
1. [Reconfigure](../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) or [restart GitLab](../administration/restart_gitlab.md#installations-from-source) for the changes to take effect if you 1. Based on how GitLab was installed, implement these changes by using
installed GitLab via Omnibus or from source respectively. the appropriate method:
On the sign in page there should now be a GitLab.com icon below the regular sign in form. - Omnibus GitLab: [Reconfigure GitLab](../administration/restart_gitlab.md#omnibus-gitlab-reconfigure).
Click the icon to begin the authentication process. GitLab.com asks the user to sign in and authorize the GitLab application. - Source: [Restart GitLab](../administration/restart_gitlab.md#installations-from-source).
If everything goes well the user is returned to your GitLab instance and is signed in.
On the sign-in page, there should now be a GitLab.com icon following the
regular sign-in form. Select the icon to begin the authentication process.
GitLab.com asks the user to sign in and authorize the GitLab application. If
everything goes well, the user is returned to your GitLab instance and is
signed in.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment