Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 29 deletions

diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md
index 242d5e6974c..f9ce716d94f 100644
--- a/doc/user/project/integrations/bamboo.md
+++ b/doc/user/project/integrations/bamboo.md
@@ -124,7 +124,7 @@ For example:
 ### Builds not triggered
 
 If builds are not triggered, ensure you entered the right GitLab IP address in
-Bamboo under **Trigger IP addresses**. Also check [integration webhook logs](index.md#troubleshooting) for request failures.
+Bamboo under **Trigger IP addresses**. Also, check the integration webhook logs for request failures.
 
 ### Advanced Atlassian Bamboo features not available in GitLab UI
 
diff --git a/doc/user/project/integrations/bugzilla.md b/doc/user/project/integrations/bugzilla.md
index febbee66c33..8b04d6aad8e 100644
--- a/doc/user/project/integrations/bugzilla.md
+++ b/doc/user/project/integrations/bugzilla.md
@@ -58,4 +58,4 @@ internal issue tracker, the internal issue is linked.
 
 ## Troubleshooting
 
-For recent integration webhook deliveries, check [integration webhook logs](index.md#troubleshooting).
+For recent integration webhook deliveries, check the integration webhook logs.
diff --git a/doc/user/project/integrations/index.md b/doc/user/project/integrations/index.md
index c62b5a3e668..f0f656ea629 100644
--- a/doc/user/project/integrations/index.md
+++ b/doc/user/project/integrations/index.md
@@ -166,40 +166,25 @@ You can configure the following integrations.
 | [YouTrack](youtrack.md)                                                     | Use YouTrack as the issue tracker.                                    | **{dotted-circle}** No |
 | [ZenTao](zentao.md) (deprecated)                                            | Use ZenTao as the issue tracker.                                      | **{dotted-circle}** No |
 
-### Project webhooks
+## Project webhooks
 
-You can configure a project webhook to listen for specific events
-like pushes, issues, or merge requests. When the webhook is triggered, GitLab
-sends a POST request with data to a specified webhook URL.
+Some integrations use [webhooks](webhooks.md) for external applications.
 
-For more information, see [Webhooks](webhooks.md).
+You can configure a project webhook to listen for specific events
+like pushes, issues, or merge requests. When the webhook is triggered,
+GitLab sends a POST request with data to a specified webhook URL.
 
-## Push hooks limit
+For a list of integrations that use webhooks, see [Available integrations](#available-integrations).
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17874) in GitLab 12.4.
+## Push hook limit
 
 If a single push includes changes to more than three branches or tags, integrations
-supported by `push_hooks` and `tag_push_hooks` events aren't executed.
+supported by `push_hooks` and `tag_push_hooks` events are not executed.
 
-You can change the number of supported branches or tags by changing the
-[`push_event_hooks_limit` application setting](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
+To change the number of supported branches or tags, configure the
+[`push_event_hooks_limit` setting](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
 
-## Contribute to integrations
+## Related topics
 
-If you're interested in developing a new native integration for GitLab, see:
-
-- [Integrations development guidelines](../../../development/integrations/index.md)
+- [Integration development guidelines](../../../development/integrations/index.md)
 - [GitLab Developer Portal](https://developer.gitlab.com)
-
-## Troubleshooting
-
-Some integrations use hooks to integrate with external applications. To confirm which ones use integration hooks, see the [available integrations](#available-integrations). For more information, see [webhook troubleshooting](webhooks.md#troubleshooting).
-
-### `Test Failed. Save Anyway` error
-
-Some integrations fail with an error `Test Failed. Save Anyway` when you set them
-up on uninitialized repositories. This error occurs because the integration uses
-push data to build the test payload, and there are no push events in the project.
-
-To resolve this error, initialize the repository by pushing a test file to the project
-and set up the integration again.