Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-09 18:09:39 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-09 18:09:39 +0300
commit6c5f3e7b4eaf92ccdd8f2e5b6204683441e207ec (patch)
tree403601fd5d8bcc8db75c2090af1f5e0b43e666d3 /doc/integration/gitlab.md
parent3c53fbc50bf8d084f1184836468850d2a83ef920 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/gitlab.md')
-rw-r--r--doc/integration/gitlab.md20
1 files changed, 6 insertions, 14 deletions
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index 94a26ee792b..97c5332c438 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -12,11 +12,9 @@ To enable the GitLab.com OmniAuth provider you must register your application wi
GitLab.com generates an application ID and secret key for you to use.
1. Sign in to GitLab.com.
-
-1. On the upper right corner, click on your avatar and go to your **Settings**.
-
-1. Select **Applications** in the left menu.
-
+1. In the top-right corner, select your avatar.
+1. Select **Edit profile**.
+1. In the left sidebar, select **Applications**.
1. Provide the required details for **Add new application**.
- Name: This can be anything. Consider something like `<Organization>'s GitLab` or `<Your Name>'s GitLab` or something else descriptive.
- Redirect URI:
@@ -29,10 +27,8 @@ GitLab.com generates an application ID and secret key for you to use.
The first link is required for the importer and second for the authorization.
1. Select **Save application**.
-
1. You should now see an **Application ID** and **Secret**. Keep this page open as you continue
configuration.
-
1. On your GitLab server, open the configuration file.
For Omnibus package:
@@ -50,10 +46,9 @@ GitLab.com generates an application ID and secret key for you to use.
```
1. See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
-
1. Add the provider configuration:
- For Omnibus package:
+ For Omnibus installations:
```ruby
gitlab_rails['omniauth_providers'] = [
@@ -76,16 +71,13 @@ GitLab.com generates an application ID and secret key for you to use.
```
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. Save the configuration file.
-
1. Based on how GitLab was installed, implement these changes by using
the appropriate method:
- - Omnibus GitLab: [Reconfigure GitLab](../administration/restart_gitlab.md#omnibus-gitlab-reconfigure).
- - Source: [Restart GitLab](../administration/restart_gitlab.md#installations-from-source).
+ - Omnibus GitLab: [reconfigure GitLab](../administration/restart_gitlab.md#omnibus-gitlab-reconfigure).
+ - Source: [restart GitLab](../administration/restart_gitlab.md#installations-from-source).
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.