Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

12 files changed, 43 insertions, 15 deletions

diff --git a/doc/user/project/integrations/bugzilla.md b/doc/user/project/integrations/bugzilla.md
index 0f7ce182e1a..ac4b9d0769b 100644
--- a/doc/user/project/integrations/bugzilla.md
+++ b/doc/user/project/integrations/bugzilla.md
@@ -38,7 +38,7 @@ project pages. This link takes you to the appropriate Bugzilla project.
 
 You can also disable [GitLab internal issue tracking](../issues/index.md) in this project.
 Learn more about the steps and consequences of disabling GitLab issues in
-[Sharing and permissions](../settings/index.md#sharing-and-permissions).
+[Sharing and permissions](../settings/index.md#configure-project-visibility-features-and-permissions).
 
 ## Reference Bugzilla issues in GitLab
 
diff --git a/doc/user/project/integrations/discord_notifications.md b/doc/user/project/integrations/discord_notifications.md
index b7e25b815fc..3780ea37c0b 100644
--- a/doc/user/project/integrations/discord_notifications.md
+++ b/doc/user/project/integrations/discord_notifications.md
@@ -32,6 +32,6 @@ With the webhook URL created in the Discord channel, you can set up the Discord
 1. Ensure that the **Active** toggle is enabled.
 1. Check the checkboxes corresponding to the GitLab events for which you want to send notifications to Discord.
 1. Paste the webhook URL that you copied from the create Discord webhook step.
-1. Configure the remaining options and click the **Save changes** button.
+1. Configure the remaining options and select the **Save changes** button.
 
 The Discord channel you created the webhook for now receives notification of the GitLab events that were configured.
diff --git a/doc/user/project/integrations/harbor.md b/doc/user/project/integrations/harbor.md
index 2a1b12057aa..1319c9e74cd 100644
--- a/doc/user/project/integrations/harbor.md
+++ b/doc/user/project/integrations/harbor.md
@@ -31,7 +31,7 @@ GitLab supports integrating Harbor projects at the group or project level. Compl
 1. Turn on the **Active** toggle under **Enable Integration**.
 1. Provide the Harbor configuration information:
    - **Harbor URL**: The base URL of Harbor instance which is being linked to this GitLab project. For example, `https://harbor.example.net`.
-   - **Harbor project name**: The project name in the Harbor instance. For example, `testproject`.  
+   - **Harbor project name**: The project name in the Harbor instance. For example, `testproject`.
    - **Username**: Your username in the Harbor instance, which should meet the requirements in [prerequisites](#prerequisites).
    - **Password**: Password of your username.
 
@@ -39,7 +39,7 @@ GitLab supports integrating Harbor projects at the group or project level. Compl
 
 After the Harbor integration is activated:
 
-- The global variables `$HARBOR_USER`, `$HARBOR_PASSWORD`, `$HARBOR_URL`, and `$HARBOR_PROJECT` are created for CI/CD use.
+- The global variables `$HARBOR_USERNAME`, `$HARBOR_PASSWORD`, `$HARBOR_URL`, and `$HARBOR_PROJECT` are created for CI/CD use.
 - The project-level integration settings override the group-level integration settings.
 
 ## Secure your requests to the Harbor APIs
diff --git a/doc/user/project/integrations/pipeline_status_emails.md b/doc/user/project/integrations/pipeline_status_emails.md
index 742ab977090..c58f5a13613 100644
--- a/doc/user/project/integrations/pipeline_status_emails.md
+++ b/doc/user/project/integrations/pipeline_status_emails.md
@@ -21,3 +21,6 @@ To enable pipeline status emails:
    **Notify only broken pipelines**.
 1. Select the branches to send notifications for.
 1. Select **Save changes**.
+
+In [GitLab 15.1](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89546)
+and later, pipeline notifications triggered by blocked users are not delivered.
diff --git a/doc/user/project/integrations/prometheus_library/nginx_ingress.md b/doc/user/project/integrations/prometheus_library/nginx_ingress.md
index 6e751b907eb..4c8e648537c 100644
--- a/doc/user/project/integrations/prometheus_library/nginx_ingress.md
+++ b/doc/user/project/integrations/prometheus_library/nginx_ingress.md
@@ -38,7 +38,7 @@ Next, the Ingress needs to be annotated for Prometheus monitoring. Two new annot
 - `prometheus.io/scrape: "true"`
 - `prometheus.io/port: "10254"`
 
-Managing these settings depends on how NGINX Ingress has been deployed. If you have deployed via the [official Helm chart](https://github.com/helm/charts/tree/master/stable/nginx-ingress), metrics can be enabled with `controller.stats.enabled` along with the required annotations. Alternatively it is possible to edit the NGINX Ingress YML directly in the [Kubernetes dashboard](https://github.com/kubernetes/dashboard).
+Managing these settings depends on how NGINX Ingress has been deployed. If you have deployed via the [official Helm chart](https://github.com/helm/charts/tree/master/stable/nginx-ingress), metrics can be enabled with `controller.stats.enabled` along with the required annotations. Alternatively it is possible to edit the NGINX Ingress YAML directly in the [Kubernetes dashboard](https://github.com/kubernetes/dashboard).
 
 ## Specifying the Environment label
 
diff --git a/doc/user/project/integrations/redmine.md b/doc/user/project/integrations/redmine.md
index bcab8d05f69..a989b418199 100644
--- a/doc/user/project/integrations/redmine.md
+++ b/doc/user/project/integrations/redmine.md
@@ -38,7 +38,7 @@ For example, this is a configuration for a project named `gitlab-ci`:
 
 You can also disable [GitLab internal issue tracking](../issues/index.md) in this project.
 Learn more about the steps and consequences of disabling GitLab issues in
-[Sharing and permissions](../settings/index.md#sharing-and-permissions).
+[Sharing and permissions](../settings/index.md#configure-project-visibility-features-and-permissions).
 
 ## Reference Redmine issues in GitLab
 
diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md
index 870554100b7..bd93fbcbcbc 100644
--- a/doc/user/project/integrations/slack.md
+++ b/doc/user/project/integrations/slack.md
@@ -91,7 +91,7 @@ the error message and keep troubleshooting from there.
 You might see an entry like the following in your Sidekiq log:
 
 ```plaintext
-2019-01-10_13:22:08.42572 2019-01-10T13:22:08.425Z 6877 TID-abcdefg ProjectServiceWorker JID-3bade5fb3dd47a85db6d78c5 ERROR: {:class=>"ProjectServiceWorker", :service_class=>"SlackService", :message=>"SSL_connect returned=1 errno=0 state=error: certificate verify failed"}
+2019-01-10_13:22:08.42572 2019-01-10T13:22:08.425Z 6877 TID-abcdefg Integrations::ExecuteWorker JID-3bade5fb3dd47a85db6d78c5 ERROR: {:class=>"Integrations::ExecuteWorker :service_class=>"SlackService", :message=>"SSL_connect returned=1 errno=0 state=error: certificate verify failed"}
 ```
 
 This issue occurs when there is a problem with GitLab communicating with Slack,
diff --git a/doc/user/project/integrations/webex_teams.md b/doc/user/project/integrations/webex_teams.md
index dd4cdb632e6..e8b2470cf13 100644
--- a/doc/user/project/integrations/webex_teams.md
+++ b/doc/user/project/integrations/webex_teams.md
@@ -33,6 +33,6 @@ notifications:
 1. Ensure that the **Active** toggle is enabled.
 1. Select the checkboxes corresponding to the GitLab events you want to receive in Webex Teams.
 1. Paste the **Webhook** URL for the Webex Teams space.
-1. Configure the remaining options and then click **Test settings and save changes**.
+1. Configure the remaining options and then select **Test settings and save changes**.
 
 The Webex Teams space begins to receive all applicable GitLab events.
diff --git a/doc/user/project/integrations/webhook_events.md b/doc/user/project/integrations/webhook_events.md
index 2bf6b4bbe01..ed62a34f6a3 100644
--- a/doc/user/project/integrations/webhook_events.md
+++ b/doc/user/project/integrations/webhook_events.md
@@ -1050,6 +1050,9 @@ Pipeline events are triggered when the status of a pipeline changes.
 In [GitLab 13.9](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53159)
 and later, the pipeline webhook returns only the latest jobs.
 
+In [GitLab 15.1](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89546)
+and later, pipeline webhooks triggered by blocked users are not processed.
+
 Request header:
 
 ```plaintext
@@ -1126,6 +1129,15 @@ Payload example:
          "email": "user@gitlab.com"
       }
    },
+   "source_pipeline":{
+      "project":{
+        "id": 41,
+        "web_url": "https://gitlab.example.com/gitlab-org/upstream-project",
+        "path_with_namespace": "gitlab-org/upstream-project",
+      },
+      "pipeline_id": 30,
+      "job_id": 3401
+   },
    "builds":[
       {
          "id": 380,
@@ -1301,6 +1313,9 @@ Job events are triggered when the status of a job changes.
 
 The `commit.id` in the payload is the ID of the pipeline, not the ID of the commit.
 
+In [GitLab 15.1](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89546)
+and later, job events triggered by blocked users are not processed.
+
 Request header:
 
 ```plaintext
@@ -1662,7 +1677,7 @@ Payload example:
 {
   "id": 1,
   "created_at": "2020-11-02 12:55:12 UTC",
-  "description": "v1.0 has been released",
+  "description": "v1.1 has been released",
   "name": "v1.1",
   "released_at": "2020-11-02 12:55:12 UTC",
   "tag": "v1.1",
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index ac7d447961c..e4ce736684b 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -40,7 +40,9 @@ including:
 ## Group webhooks **(PREMIUM)**
 
 You can configure a group webhook, which is triggered by events
-that occur across all projects in the group.
+that occur across all projects in the group. If you configure identical webhooks
+in a group and a project, they are both triggered by an event in the
+project.
 
 Group webhooks can also be configured to listen for events that are
 specific to a group, including:
@@ -171,7 +173,8 @@ work you must have Ruby installed.
    ruby print_http_body.rb 8000
    ```
 
-1. In GitLab, add your webhook receiver as `http://my.host:8000/`.
+1. In GitLab, [configure the webhook](#configure-a-webhook-in-gitlab) and add your
+   receiver's URL, for example, `http://receiver.example.com:8000/`.
 
 1. Select **Test**. You should see something like this in the console:
 
diff --git a/doc/user/project/integrations/youtrack.md b/doc/user/project/integrations/youtrack.md
index 6c70a5e679b..25fc9c4e1c3 100644
--- a/doc/user/project/integrations/youtrack.md
+++ b/doc/user/project/integrations/youtrack.md
@@ -29,7 +29,7 @@ project pages. This link takes you to the appropriate YouTrack project.
 
 You can also disable [GitLab internal issue tracking](../issues/index.md) in this project.
 Learn more about the steps and consequences of disabling GitLab issues in
-[Sharing and permissions](../settings/index.md#sharing-and-permissions).
+[Sharing and permissions](../settings/index.md#configure-project-visibility-features-and-permissions).
 
 ## Reference YouTrack issues in GitLab
 
diff --git a/doc/user/project/integrations/zentao.md b/doc/user/project/integrations/zentao.md
index 67125c3ebbf..0256c52e4a3 100644
--- a/doc/user/project/integrations/zentao.md
+++ b/doc/user/project/integrations/zentao.md
@@ -10,11 +10,18 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 [ZenTao](https://www.zentao.net/) is a web-based project management platform.
 
+The following versions of ZenTao are supported:
+
+- ZenTao 15.4
+- ZenTao Pro 10.2
+- ZenTao Biz 5.2
+- ZenTao Max 2.2
+
 ## Configure ZenTao
 
-This integration requires a ZenTao API secret key.  
+This integration requires a ZenTao API secret key.
 
-Complete these steps in ZenTao:  
+Complete these steps in ZenTao:
 
 1. Go to your **Admin** page and select **Develop > Application**.
 1. Select **Add Application**.
@@ -32,7 +39,7 @@ Complete these steps in GitLab:
 1. Turn on the **Active** toggle under **Enable Integration**.
 1. Provide the ZenTao configuration information:
    - **ZenTao Web URL**: The base URL of the ZenTao instance web interface you're linking to this GitLab project (for example, `example.zentao.net`).
-   - **ZenTao API URL** (optional): The base URL to the ZenTao instance API. Defaults to the Web URL value if not set.  
+   - **ZenTao API URL** (optional): The base URL to the ZenTao instance API. Defaults to the Web URL value if not set.
    - **ZenTao API token**: Use the key you generated when you [configured ZenTao](#configure-zentao).
    - **ZenTao Product ID**: To display issues from a single ZenTao product in a given GitLab project. The Product ID can be found in the ZenTao product page under **Settings > Overview**.