diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-11 00:15:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-11 00:15:20 +0300 |
| commit | 9abffa14d6395d56b77313541d63e0c12ae2b602 (patch) | |
| tree | 55eb69304c835d5e0b49344d331ee851add9647a /doc/user/project/integrations | |
| parent | e0277d5393d958865fdec470176ac5874edded06 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/integrations')
| -rw-r--r-- | doc/user/project/integrations/bamboo.md | 1 | ||||
| -rw-r--r-- | doc/user/project/integrations/overview.md | 9 | ||||
| -rw-r--r-- | doc/user/project/integrations/webhooks.md | 11 |
3 files changed, 11 insertions, 10 deletions
diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md index 38de8d9f1af..bf343078634 100644 --- a/doc/user/project/integrations/bamboo.md +++ b/doc/user/project/integrations/bamboo.md @@ -46,6 +46,7 @@ integration in GitLab. 1. Select **Atlassian Bamboo**. 1. Ensure the **Active** checkbox is selected. 1. Enter the base URL of your Bamboo server. For example, `https://bamboo.example.com`. +1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](overview.md#ssl-verification). 1. Enter the [build key](#identify-the-bamboo-build-plan-build-key) from your Bamboo build plan. 1. If necessary, enter a username and password for a Bamboo user that has diff --git a/doc/user/project/integrations/overview.md b/doc/user/project/integrations/overview.md index 5b83df9b22e..8ecc16050be 100644 --- a/doc/user/project/integrations/overview.md +++ b/doc/user/project/integrations/overview.md @@ -82,6 +82,15 @@ instance configuration or provide custom settings. Read more about [Project integration management](../../admin_area/settings/project_integration_management.md). +## SSL verification + +By default, the SSL certificate for outgoing HTTP requests is verified based on +an internal list of Certificate Authorities. This means the certificate cannot +be self-signed. + +You can turn off SSL verification in the configuration settings for [webhooks](webhooks.md#configure-a-webhook) +and some integrations. + ## Troubleshooting integrations Some integrations use service hooks for integration with external applications. To confirm which ones use service hooks, see the [integrations listing](#integrations-listing) above. Learn more about [troubleshooting service hooks](webhooks.md#troubleshoot-webhooks). diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index 8bc2b51276a..ace5783c852 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -57,7 +57,7 @@ You can configure a webhook for a group or a project. The URL must be percent-encoded if it contains one or more special characters. 1. In **Secret token**, enter the [secret token](#validate-payloads-by-using-a-secret-token) to validate payloads. 1. In the **Trigger** section, select the [events](webhook_events.md) to trigger the webhook. -1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](#verify-an-ssl-certificate). +1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](overview.md#ssl-verification). 1. Select **Add webhook**. ## Test a webhook @@ -123,15 +123,6 @@ The token is sent with the hook request in the `X-Gitlab-Token` HTTP header. Your webhook endpoint can check the token to verify that the request is legitimate. -## Verify an SSL certificate - -By default, the SSL certificate of the webhook endpoint is verified based on -an internal list of Certificate Authorities. This means the certificate cannot -be self-signed. - -You can turn off SSL verification in the [webhook settings](#configure-a-webhook) -in your GitLab projects. - ## Filter push events by branch Push events can be filtered by branch using a branch name or wildcard pattern |