Add latest changes from gitlab-org/gitlab@master

4 files changed, 27 insertions, 7 deletions

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/webhook_events.md b/doc/user/project/integrations/webhook_events.md
index 465a51def7c..1d0cd3cdbbd 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
@@ -1310,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
diff --git a/doc/user/project/merge_requests/img/ff_merge_rebase_v14_9.png b/doc/user/project/merge_requests/img/ff_merge_rebase_v14_9.png
deleted file mode 100644
index 17ce42e7a69..00000000000
--- a/doc/user/project/merge_requests/img/ff_merge_rebase_v14_9.png
+++ /dev/null
diff --git a/doc/user/project/merge_requests/methods/index.md b/doc/user/project/merge_requests/methods/index.md
index 12e49e43fae..d8b4644b1b8 100644
--- a/doc/user/project/merge_requests/methods/index.md
+++ b/doc/user/project/merge_requests/methods/index.md
@@ -87,8 +87,6 @@ method selected, you can accept it **only if a fast-forward merge is possible**.
 
 ## Rebasing in (semi-)linear merge methods
 
-> Rebasing without running a CI/CD pipeline [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118825) in GitLab 14.7.
-
 In these merge methods, you can merge only when your source branch is up-to-date with the target branch:
 
 - Merge commit with semi-linear history.
@@ -96,11 +94,7 @@ In these merge methods, you can merge only when your source branch is up-to-date
 
 If a fast-forward merge is not possible but a conflict-free rebase is possible,
 GitLab offers you the [`/rebase` quick action](../../../../topics/git/git_rebase.md#rebase-from-the-gitlab-ui),
-and the ability to **Rebase** from the user interface:
-
-![Fast forward merge request](../img/ff_merge_rebase_v14_9.png)
-
-In [GitLab 14.7](https://gitlab.com/gitlab-org/gitlab/-/issues/118825) and later, you can also rebase without running a CI/CD pipeline.
+and the ability to select **Rebase** from the user interface.
 
 If the target branch is ahead of the source branch and a conflict-free rebase is
 not possible, you must rebase the source branch locally before you can do a fast-forward merge.
@@ -110,6 +104,23 @@ not possible, you must rebase the source branch locally before you can do a fast
 Rebasing may be required before squashing, even though squashing can itself be
 considered equivalent to rebasing.
 
+### Rebase without CI/CD pipeline
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118825) in GitLab 14.7 [with a flag](../../../../administration/feature_flags.md) named `rebase_without_ci_ui`. Disabled by default.
+
+FLAG:
+On GitLab.com and self-managed GitLab, by default this feature is not available. To make it available,
+ask an administrator to [enable the feature flag](../../../../administration/feature_flags.md) named `rebase_without_ci_ui`.
+The feature is not ready for production use.
+
+To rebase a merge request's branch without triggering a CI/CD pipeline, select 
+**Rebase without pipeline** from the merge request reports section.
+This option is available when fast-forward merge is not possible but a conflict-free
+rebase is possible.
+
+Rebasing without a CI/CD pipeline saves resources in projects with a semi-linear
+workflow that requires frequent rebases.
+
 ## Related topics
 
 - [Commits history](../commits.md)