diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 03:07:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 03:07:31 +0000 |
| commit | 9caed104bc903734d996161ba13a579f2be49d7c (patch) | |
| tree | d7c3e6a534dfa85128f1011c4fb16f7f697d3f80 /doc/integration | |
| parent | a59c9590f5171f3638a1b2abeff55157aedc577b (diff) | |
| download | gitlab-ce-9caed104bc903734d996161ba13a579f2be49d7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/jenkins.md | 4 | ||||
| -rw-r--r-- | doc/integration/vault.md | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md index 32816652ed5..fe607b2afdf 100644 --- a/doc/integration/jenkins.md +++ b/doc/integration/jenkins.md @@ -138,7 +138,7 @@ configured or there was an error reporting the status via the API. ### Merge Request event does not trigger a Jenkins Pipeline -Check the **/var/log/gitlab/gitlab-rails/production.log** file for messages like: +Check the `/var/log/gitlab/gitlab-rails/production.log` file for messages like: ```plaintext WebHook Error => Net::ReadTimeout @@ -157,7 +157,7 @@ which is set to 10 seconds by default. To fix this the `gitlab_rails['webhook_timeout']` value will need to be increased in the `gitlab.rb` config file, followed by the [`gitlab-ctl reconfigure` command](../administration/restart_gitlab.md). -If you don't find the errors above, but do find *duplicate* entries like below (in **/var/log/gitlab/gitlab-rail**), this +If you don't find the errors above, but do find *duplicate* entries like below (in `/var/log/gitlab/gitlab-rail`), this could also indicate that [webhook requests are timing out](../user/project/integrations/webhooks.md#receiving-duplicate-or-multiple-webhook-requests-triggered-by-one-event): ``` 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.  @@ -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. |