Commit 8196f3a5 authored by Markus Koller's avatar Markus Koller Committed by Kati Paizee

Update integration docs for new SSL verification settings

parent 0de91528
...@@ -137,6 +137,7 @@ than the [webhook integration](#configure-a-webhook). ...@@ -137,6 +137,7 @@ than the [webhook integration](#configure-a-webhook).
- Merge request - Merge request
- Tag push - Tag push
1. Enter the **Jenkins server URL**. 1. Enter the **Jenkins server URL**.
1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](../user/project/integrations/overview.md#ssl-verification).
1. Enter the **Project name**. 1. Enter the **Project name**.
The project name should be URL-friendly, where spaces are replaced with underscores. To ensure The project name should be URL-friendly, where spaces are replaced with underscores. To ensure
......
...@@ -46,6 +46,7 @@ integration in GitLab. ...@@ -46,6 +46,7 @@ integration in GitLab.
1. Select **Atlassian Bamboo**. 1. Select **Atlassian Bamboo**.
1. Ensure the **Active** checkbox is selected. 1. Ensure the **Active** checkbox is selected.
1. Enter the base URL of your Bamboo server. For example, `https://bamboo.example.com`. 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 1. Enter the [build key](#identify-the-bamboo-build-plan-build-key) from your Bamboo
build plan. build plan.
1. If necessary, enter a username and password for a Bamboo user that has 1. If necessary, enter a username and password for a Bamboo user that has
......
...@@ -82,6 +82,15 @@ instance configuration or provide custom settings. ...@@ -82,6 +82,15 @@ instance configuration or provide custom settings.
Read more about [Project integration management](../../admin_area/settings/project_integration_management.md). 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 ## 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). 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).
......
...@@ -57,7 +57,7 @@ You can configure a webhook for a group or a project. ...@@ -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. 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 **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. 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**. 1. Select **Add webhook**.
## Test a webhook ## Test a webhook
...@@ -123,15 +123,6 @@ The token is sent with the hook request in the ...@@ -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 `X-Gitlab-Token` HTTP header. Your webhook endpoint can check the token to verify
that the request is legitimate. 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 ## Filter push events by branch
Push events can be filtered by branch using a branch name or wildcard pattern Push events can be filtered by branch using a branch name or wildcard pattern
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment