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>2019-12-11 06:07:31 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-11 06:07:31 +0300
commit9caed104bc903734d996161ba13a579f2be49d7c (patch)
treed7c3e6a534dfa85128f1011c4fb16f7f697d3f80 /doc/integration/vault.md
parenta59c9590f5171f3638a1b2abeff55157aedc577b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration/vault.md')
-rw-r--r--doc/integration/vault.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/vault.md b/doc/integration/vault.md
index 4aca62b5fd1..68803fed35d 100644
--- a/doc/integration/vault.md
+++ b/doc/integration/vault.md
@@ -19,7 +19,7 @@ The following assumes you already have Vault installed and running.
1. On GitLab, click your avatar on the top-right corner, and select your user **Settings > Applications**.
1. Fill out the application **Name** and [**Redirect URI**](https://www.vaultproject.io/docs/auth/jwt.html#redirect-uris),
- making sure to select the **openid** scope.
+ making sure to select the **OpenID** scope.
1. Save application.
1. Copy client ID and secret, or keep the page open for reference.
![GitLab OAuth provider](img/gitlab_oauth_vault_v12_6.png)
@@ -42,7 +42,7 @@ The following assumes you already have Vault installed and running.
1. **Write the OIDC config:**
- Next, Vault needs to be given the application ID and secret generated by Gitlab.
+ Next, Vault needs to be given the application ID and secret generated by GitLab.
In the terminal session, run the following command to give Vault access to the GitLab application you've just created with an OpenID scope. This allows Vault to authenticate through GitLab.