Add latest changes from gitlab-org/gitlab@master

4 files changed, 37 insertions, 5 deletions

diff --git a/doc/development/fe_guide/customizable_dashboards.md b/doc/development/fe_guide/customizable_dashboards.md
index 9ba0d4bb40c..500c29655df 100644
--- a/doc/development/fe_guide/customizable_dashboards.md
+++ b/doc/development/fe_guide/customizable_dashboards.md
@@ -74,7 +74,7 @@ export const pageViewsOverTime = {
       dimensions: [],
       filters: [
         {
-          member: 'TrackedEvents.event',
+          member: 'TrackedEvents.eventName',
           operator: 'equals',
           values: ['page_view']
         }
diff --git a/doc/subscriptions/gitlab_dedicated/index.md b/doc/subscriptions/gitlab_dedicated/index.md
index e6a6aace3b4..4e1b36cf8a4 100644
--- a/doc/subscriptions/gitlab_dedicated/index.md
+++ b/doc/subscriptions/gitlab_dedicated/index.md
@@ -110,9 +110,9 @@ With GitLab Dedicated, you must [install the GitLab Runner application](https://
 
 To help you migrate your data to GitLab Dedicated, you can choose from the following options:
 
-1. When migrating from another GitLab instance, you can either:
-    - Use the UI, by using [direct transfer](../../user/group/import/index.md) to import groups and projects.
-    - Use APIs, including the [group import API](../../api/group_import_export.md) and [project import API](../../api/project_import_export.md).
+1. When migrating from another GitLab instance, you can import groups and projects by either:
+    - Using [direct transfer](../../user/group/import/index.md).
+    - Using the [direct transfer](../../api/bulk_imports.md) API.
 1. When migrating from third-party services, you can use [the GitLab importers](../../user/project/import/index.md#supported-import-sources).
 1. You can also engage [Professional Services](../../user/project/import/index.md#migrate-by-engaging-professional-services).
 
diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md
index 63ac1d845e0..d9bf9f758f6 100644
--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -263,3 +263,35 @@ you can't approve a merge request if you have rebased it.
 - [Numerous undo possibilities in Git](numerous_undo_possibilities_in_git/index.md#undo-staged-local-changes-without-modifying-history)
 - [Git documentation for branches and rebases](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 - [Project squash and merge settings](../../user/project/merge_requests/squash_and_merge.md#configure-squash-options-for-a-project)
+
+## Troubleshooting
+
+### `Unmergeable state` after `/rebase` quick action
+
+The `/rebase` command schedules a background task. The task attempts to rebase
+the changes in the source branch on the latest commit of the target branch.
+If, after using the `/rebase`
+[quick action](../../user/project/quick_actions.md#issues-merge-requests-and-epics),
+you see this error, a rebase cannot be scheduled:
+
+```plaintext
+This merge request is currently in an unmergeable state, and cannot be rebased.
+```
+
+This error occurs if any of these conditions are true:
+
+- Conflicts exist between the source and target branches.
+- The source branch contains no commits.
+- Either the source or target branch does not exist.
+- An error has occurred, resulting in no diff being generated.
+
+To resolve the `unmergeable state` error:
+
+1. Resolve any merge conflicts.
+1. Confirm the source branch exists, and has commits.
+1. Confirm the target branch exists.
+1. Confirm the diff has been generated.
+
+### `/merge` quick action ignored after `/rebase`
+
+If `/rebase` is used, `/merge` is ignored to avoid a race condition where the source branch is merged or deleted before it is rebased.
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index be119275cd3..bd1eab6a3e1 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -90,7 +90,7 @@ To auto-format this table, use the VS Code Markdown Table formatter: `https://do
 | `/ready`                                                                                         | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Set the [ready status](merge_requests/drafts.md#mark-merge-requests-as-ready) ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90361) in GitLab 15.1). |
 | `/reassign @user1 @user2`                                                                        | **{check-circle}** Yes | **{check-circle}** Yes | **{dotted-circle}** No | Replace current assignees with those specified. |
 | `/reassign_reviewer @user1 @user2`                                                               | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Replace current reviewers with those specified. |
-| `/rebase`                                                                                        | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Rebase source branch. This schedules a background task that attempts to rebase the changes in the source branch on the latest commit of the target branch. If `/rebase` is used, `/merge` is ignored to avoid a race condition where the source branch is merged or deleted before it is rebased. If there are merge conflicts, GitLab displays a message that a rebase cannot be scheduled. Rebase failures are displayed with the merge request status. |
+| `/rebase`                                                                                        | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Rebase source branch on the latest commit of the target branch. For help, see [troubleshooting `git rebase`](../../topics/git/git_rebase.md#troubleshooting). |
 | `/relabel ~label1 ~label2`                                                                       | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Replace current labels with those specified. |
 | `/relate #issue1 #issue2`                                                                        | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Mark issues as related. |
 | `/remove_child_epic <epic>`                                                                      | **{dotted-circle}** No | **{dotted-circle}** No | **{check-circle}** Yes | Remove child epic from `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. |