diff options
Diffstat (limited to 'doc/integration/gitlab.md')
| -rw-r--r-- | doc/integration/gitlab.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md index 8767d1398ac..92709d974aa 100644 --- a/doc/integration/gitlab.md +++ b/doc/integration/gitlab.md @@ -37,13 +37,13 @@ GitLab.com generates an application ID and secret key for you to use. configuration. 1. On your GitLab server, open the configuration file. - For Omnibus package: + For Linux package installations: ```shell sudo editor /etc/gitlab/gitlab.rb ``` - For installations from source: + For self-compiled installations: ```shell cd /home/git/gitlab @@ -56,7 +56,7 @@ GitLab.com generates an application ID and secret key for you to use. account provisioning for users who do not have an existing GitLab account. 1. Add the provider configuration: - For Omnibus installations authenticating against **GitLab.com**: + For Linux package installations authenticating against **GitLab.com**: ```ruby gitlab_rails['omniauth_providers'] = [ @@ -70,7 +70,7 @@ GitLab.com generates an application ID and secret key for you to use. ] ``` - Or, for Omnibus installations authenticating against a different GitLab instance: + Or, for Linux package installations authenticating against a different GitLab instance: ```ruby gitlab_rails['omniauth_providers'] = [ @@ -85,7 +85,7 @@ GitLab.com generates an application ID and secret key for you to use. ] ``` - For installations from source authenticating against **GitLab.com**: + For self-compiled installations authenticating against **GitLab.com**: ```yaml - { name: 'gitlab', @@ -94,7 +94,7 @@ GitLab.com generates an application ID and secret key for you to use. app_secret: 'YOUR_APP_SECRET', ``` - Or, for installations from source to authenticate against a different GitLab instance: + Or, for self-compiled installations to authenticate against a different GitLab instance: ```yaml - { name: 'gitlab', @@ -113,7 +113,7 @@ GitLab.com generates an application ID and secret key for you to use. 1. Save the configuration file. 1. Implement these changes by using the appropriate method: - For Linux package installations, [reconfigure GitLab](../administration/restart_gitlab.md#reconfigure-a-linux-package-installation). - - For self-compiled installations, [restart GitLab](../administration/restart_gitlab.md#installations-from-source). + - For self-compiled installations, [restart GitLab](../administration/restart_gitlab.md#self-compiled-installations). 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. |