Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 3 deletions

diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 95420764226..4412eb56c82 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -19846,6 +19846,7 @@ Represents a product analytics dashboard panel.
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="productanalyticsdashboardpanelgridattributes"></a>`gridAttributes` | [`JSON`](#json) | Description of the position and size of the panel. |
+| <a id="productanalyticsdashboardpanelqueryoverrides"></a>`queryOverrides` | [`JSON`](#json) | Overrides for the visualization query object. |
 | <a id="productanalyticsdashboardpaneltitle"></a>`title` | [`String!`](#string) | Title of the panel. |
 | <a id="productanalyticsdashboardpanelvisualization"></a>`visualization` | [`ProductAnalyticsDashboardVisualization!`](#productanalyticsdashboardvisualization) | Visualization of the panel. |
 
diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md
index bc9337481d4..dd2260b04dc 100644
--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -44,10 +44,9 @@ branch, such as `release-15-3`. You can also specify a different remote reposito
 To back up a branch before taking any destructive action, like a rebase or force push:
 
 1. Open your feature branch in the terminal: `git checkout my-feature`
-1. Check out a new branch from it: `git checkout -b my-feature-backup`
+1. Create a backup branch: `git branch my-feature-backup`
    Any changes added to `my-feature` after this point are lost
    if you restore from the backup branch.
-1. Change back to your original branch: `git checkout my-feature`
 
 Your branch is backed up, and you can try a rebase or a force push.
 If anything goes wrong, restore your branch from its backup:
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index ecf0f68de0e..8346269ec37 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -776,9 +776,12 @@ echo $( ruby -rsecurerandom -e "puts SecureRandom.base64(32)" ) > ~/.gitlab-mail
 
 If you run GitLab on more than one machine, you need to provide the secret key file for each machine.
 
-We highly encourage GitLab administrators to start using the `webhook` delivery method for
+We encourage GitLab administrators to switch to the webhook delivery method for
 `incoming_email_delivery_method` and `service_desk_email_delivery_method` instead of `sidekiq`.
 
+[Issue 393157](https://gitlab.com/gitlab-org/gitlab/-/issues/393157) tracks improving email ingestion in general.
+We hope this will simplify infrastructure setup and add several improvements to how you manage GitLab in the near future.
+
 </div>
 
 <div class="deprecation breaking-change" data-milestone="17.0">