Add latest changes from gitlab-org/gitlab@master

6 files changed, 76 insertions, 53 deletions

diff --git a/app/assets/stylesheets/page_bundles/milestone.scss b/app/assets/stylesheets/page_bundles/milestone.scss
index aa582db10d2..c401f1a4902 100644
--- a/app/assets/stylesheets/page_bundles/milestone.scss
+++ b/app/assets/stylesheets/page_bundles/milestone.scss
@@ -167,7 +167,7 @@ $status-box-line-height: 26px;
   border-bottom: 1px solid var(--border-color, $border-color);
 }
 
-@include media-breakpoint-down(xs) {
+@include media-breakpoint-down(md) {
   .milestone-actions {
     @include clearfix();
     padding-top: $gl-vert-padding;
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index 4e06b7902bd..45699808b6b 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -4,7 +4,7 @@
 
 %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id }
   .row
-    .col-sm-6
+    .col-md-6
       .gl-mb-2
         %strong{ data: { qa_selector: "milestone_link", qa_milestone_title: milestone.title } }
           = link_to truncate(milestone.title, length: 100), milestone_path(milestone)
@@ -33,18 +33,18 @@
       %div
         = render('shared/milestone_expired', milestone: milestone)
         - if milestone.group_milestone?
-          = gl_badge_tag milestone.group.full_name, variant: :info
+          = gl_badge_tag milestone.group.full_name, { variant: :info }, { class: 'gl-white-space-normal gl-text-left' }
         - if milestone.project_milestone?
-          = gl_badge_tag milestone.project.full_name, variant: :muted
+          = gl_badge_tag milestone.project.full_name, { variant: :muted }, { class: 'gl-white-space-normal gl-text-left' }
 
-    .col-sm-4.milestone-progress
+    .col-md-4.milestone-progress
       = milestone_progress_bar(milestone)
       = link_to pluralize(milestone.total_issues_count, _('Issue')), issues_path
       - if milestone.merge_requests_enabled?
         ·
         = link_to pluralize(milestone.total_merge_requests_count, _('Merge request')), merge_requests_path
       .float-lg-right.light #{milestone.percent_complete}% complete
-    .col-sm-2
+    .col-md-2
       .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end
         - if @project # if in milestones list on project level
           - if can_admin_group_milestones?
diff --git a/doc/user/project/merge_requests/getting_started.md b/doc/user/project/merge_requests/getting_started.md
index 61b05afbaf9..c1986a80ca0 100644
--- a/doc/user/project/merge_requests/getting_started.md
+++ b/doc/user/project/merge_requests/getting_started.md
@@ -51,7 +51,7 @@ Learn the various ways to [create a merge request](creating_merge_requests.md).
 When you start a new merge request, you can immediately include the following
 options. You can also add them later by either selecting **Edit** on the merge
 request's page at the top-right side, or by using
-[keyboard shortcuts for merge requests](../../shortcuts.md#issues-and-merge-requests):
+[keyboard shortcuts for merge requests](../../shortcuts.md#merge-requests):
 
 - [Assign](index.md#assign-a-user-to-a-merge-request) the merge request to a colleague for review. With [multiple assignees](index.md#assign-multiple-users), you can assign it to more than one person at a time.
 - Set a [milestone](../milestones/index.md) to track time-sensitive changes.
@@ -76,7 +76,7 @@ After you have created the merge request, you can also:
 
 Many of these options can be set:
 
-- From the merge request page, with [keyboard shortcuts](../../shortcuts.md#issues-and-merge-requests).
+- From the merge request page, with [keyboard shortcuts](../../shortcuts.md#merge-requests).
 - When pushing changes from the command line, with [Git push options](../push_options.md).
 
 See also other [features associated to merge requests](reviews/index.md#associated-features).
diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md
index 512faae82a9..2c3376c2689 100644
--- a/doc/user/project/merge_requests/reviews/index.md
+++ b/doc/user/project/merge_requests/reviews/index.md
@@ -221,7 +221,7 @@ These features are associated with merge requests:
   GitLab can provide the option to resolve certain merge request conflicts in the GitLab UI.
 - [Revert changes](../revert_changes.md):
   Revert changes from any commit from a merge request.
-- [Keyboard shortcuts](../../../shortcuts.md#issues-and-merge-requests):
+- [Keyboard shortcuts](../../../shortcuts.md#merge-requests):
   Access and modify specific parts of a merge request with keyboard commands.
 
 ## Troubleshooting
diff --git a/doc/user/shortcuts.md b/doc/user/shortcuts.md
index e5285d63cf4..a6e9968d1e0 100644
--- a/doc/user/shortcuts.md
+++ b/doc/user/shortcuts.md
@@ -25,21 +25,23 @@ explained in each section.
 
 These shortcuts are available in most areas of GitLab:
 
-| Keyboard shortcut               | Description |
-|---------------------------------|-------------|
-| <kbd>?</kbd>                    | Show or hide the shortcut reference sheet. |
-| <kbd>Shift</kbd> + <kbd>p</kbd> | Go to your Projects page. |
-| <kbd>Shift</kbd> + <kbd>g</kbd> | Go to your Groups page. |
-| <kbd>Shift</kbd> + <kbd>a</kbd> | Go to your Activity page. |
-| <kbd>Shift</kbd> + <kbd>l</kbd> | Go to your Milestones page. |
-| <kbd>Shift</kbd> + <kbd>s</kbd> | Go to your Snippets page. |
-| <kbd>s</kbd> / <kbd>/</kbd>     | Put cursor in the search bar. |
-| <kbd>Shift</kbd> + <kbd>i</kbd> | Go to your Issues page. |
-| <kbd>Shift</kbd> + <kbd>m</kbd> | Go to your [Merge requests](project/merge_requests/index.md) page. |
-| <kbd>Shift</kbd> + <kbd>t</kbd> | Go to your To-Do List page. |
+| Keyboard shortcut                  | Description |
+|------------------------------------|-------------|
+| <kbd>?</kbd>                       | Show or hide the shortcut reference sheet. |
+| <kbd>Shift</kbd> + <kbd>p</kbd>    | Go to your Projects page. |
+| <kbd>Shift</kbd> + <kbd>g</kbd>    | Go to your Groups page. |
+| <kbd>Shift</kbd> + <kbd>a</kbd>    | Go to your Activity page. |
+| <kbd>Shift</kbd> + <kbd>l</kbd>    | Go to your Milestones page. |
+| <kbd>Shift</kbd> + <kbd>s</kbd>    | Go to your Snippets page. |
+| <kbd>s</kbd> / <kbd>/</kbd>        | Put cursor in the search bar. |
+| <kbd>f</kbd>                       | Put cursor in the filter bar. |
+| <kbd>Shift</kbd> + <kbd>i</kbd>    | Go to your Issues page. |
+| <kbd>Shift</kbd> + <kbd>m</kbd>    | Go to your [Merge requests](project/merge_requests/index.md) page. |
+| <kbd>Shift</kbd> + <kbd>t</kbd>    | Go to your To-Do List page. |
 | <kbd>p</kbd> then <kbd>b</kbd>     | Show or hide the Performance Bar. |
+| <kbd>Escape</kbd>                  | Hide tooltips or popovers. |
 | <kbd>g</kbd> then <kbd>x</kbd>     | Toggle between [GitLab](https://gitlab.com/) and [GitLab Next](https://next.gitlab.com/) (GitLab SaaS only). |
-| <kbd>.</kbd>                    | Open the [Web IDE](project/web_ide/index.md). |
+| <kbd>.</kbd>                       | Open the [Web IDE](project/web_ide/index.md). |
 
 Additionally, the following shortcuts are available when editing text in text
 fields (for example, comments, replies, issue descriptions, and merge request
@@ -51,7 +53,7 @@ descriptions):
 | <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>p</kbd> | <kbd>Control</kbd> + <kbd>Shift</kbd> + <kbd>p</kbd> | Toggle Markdown preview when editing text in a text field that has **Write** and **Preview** tabs at the top. |
 | <kbd>Command</kbd> + <kbd>b</kbd>       | <kbd>Control</kbd> + <kbd>b</kbd> | Bold the selected text (surround it with `**`). |
 | <kbd>Command</kbd> + <kbd>i</kbd>       | <kbd>Control</kbd> + <kbd>i</kbd> | Italicize the selected text (surround it with `_`). |
-| <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>s</kbd> | <kbd>Control</kbd> + <kbd>Shift</kbd> + <kbd>s</kbd> | Strike through the selected text (surround it with `~~`). |
+| <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>x</kbd> | <kbd>Control</kbd> + <kbd>Shift</kbd> + <kbd>x</kbd> | Strike through the selected text (surround it with `~~`). |
 | <kbd>Command</kbd> + <kbd>k</kbd>       | <kbd>Control</kbd> + <kbd>k</kbd> | Add a link (surround the selected text with `[]()`). |
 
 The shortcuts for editing in text fields are always enabled, even if other
@@ -79,13 +81,14 @@ relatively quickly to work, and they take you to another page in the project.
 | <kbd>g</kbd> + <kbd>j</kbd> | Go to the CI/CD jobs list (**CI/CD > Jobs**). |
 | <kbd>g</kbd> + <kbd>l</kbd> | Go to the project metrics (**Monitor > Metrics**). |
 | <kbd>g</kbd> + <kbd>e</kbd> | Go to the project environments (**Deployments > Environments**). |
-| <kbd>g</kbd> + <kbd>k</kbd> | Go to the project Kubernetes cluster integration page (**Infrastructure > Kubernetes clusters**). Note that you must have at least [`maintainer` permissions](permissions.md) to access this page. |
+| <kbd>g</kbd> + <kbd>k</kbd> | Go to the project Kubernetes cluster integration page (**Infrastructure > Kubernetes clusters**). You must have at least [`maintainer` permissions](permissions.md) to access this page. |
 | <kbd>g</kbd> + <kbd>s</kbd> | Go to the project snippets list (**Snippets**). |
 | <kbd>g</kbd> + <kbd>w</kbd> | Go to the [project wiki](project/wiki/index.md) (**Wiki**), if enabled. |
+| <kbd>.</kbd>                | Open the [Web IDE](project/web_ide/index.md). |
 
-### Issues and merge requests
+### Issues
 
-These shortcuts are available when viewing issues and [merge requests](project/merge_requests/index.md):
+These shortcuts are available when viewing issues:
 
 | Keyboard shortcut            | Description |
 |------------------------------|-------------|
@@ -94,18 +97,26 @@ These shortcuts are available when viewing issues and [merge requests](project/m
 | <kbd>m</kbd>                 | Change milestone. |
 | <kbd>l</kbd>                 | Change label. |
 | <kbd>r</kbd>                 | Start writing a comment. Pre-selected text is quoted in the comment. Can't be used to reply in a thread. |
-| <kbd>n</kbd>                 | Move to next unresolved discussion (merge requests only). |
-| <kbd>p</kbd>                 | Move to previous unresolved discussion (merge requests only). |
-| <kbd>]</kbd> or <kbd>j</kbd> | Move to next file (merge requests only). |
-| <kbd>[</kbd> or <kbd>k</kbd> | Move to previous file (merge requests only). |
-| <kbd>b</kbd>                 | Copy source branch name (merge requests only). |
 | <kbd>.</kbd>                 | Open the [Web IDE](project/web_ide/index.md). |
-
-Merge requests additionally support the following shortcuts:
-
-| macOS shortcut                  | Windows shortcut    | Description |
-|---------------------------------|---------------------|-------------|
-| <kbd>Command</kbd> + <kbd>p</kbd>     | <kbd>Control</kbd> + <kbd>p</kbd> | Search for, and then jump to a file for review. |
+| <kbd>→</kbd>                 | Go to the next design. |
+| <kbd>←</kbd>                 | Go to the previous design. |
+| <kbd>Escape</kbd>            | Close the design. |
+
+### Merge requests
+
+These shortcuts are available when viewing [merge requests](project/merge_requests/index.md):
+
+| macOS shortcut                    | Windows shortcut    | Description |
+|-----------------------------------|---------------------|-------------|
+| <kbd>]</kbd> or <kbd>j</kbd>      |                     | Move to next file. |
+| <kbd>&#91;</kbd> or <kbd>k</kbd>     |                     | Move to previous file. |
+| <kbd>Command</kbd> + <kbd>p</kbd> | <kbd>Control</kbd> + <kbd>p</kbd> | Search for, and then jump to a file for review. |
+| <kbd>n</kbd>                      |                     | Move to next unresolved discussion. |
+| <kbd>p</kbd>                      |                     | Move to previous unresolved discussion. |
+| <kbd>b</kbd>                      |                     |  Copy source branch name. |
+| <kbd>r</kbd>                      |                     |  Start writing a comment. Pre-selected text is quoted in the comment. Can't be used to reply in a thread. |
+| <kbd>c</kbd>                      |                     |  Move to next commit. |
+| <kbd>x</kbd>                      |                     |  Move to previous commit. |
 
 ### Project files
 
@@ -119,14 +130,14 @@ These shortcuts are available when browsing the files in a project (go to
 | <kbd>Enter</kbd>  | Open selection. |
 | <kbd>Escape</kbd> | Go back to file list screen (only while searching for files, **Repository > Files**, then select **Find File**). |
 | <kbd>y</kbd>      | Go to file permalink (only while viewing a file). |
-| <kbd>.</kbd>     | Open the [Web IDE](project/web_ide/index.md). |
+| <kbd>.</kbd>      | Open the [Web IDE](project/web_ide/index.md). |
 
 ### Web IDE
 
 These shortcuts are available when editing a file with the [Web IDE](project/web_ide/index.md):
 
-| macOS shortcut                  | Windows shortcut    | Description |
-|---------------------------------|---------------------|-------------|
+| macOS shortcut                        | Windows shortcut    | Description |
+|---------------------------------------|---------------------|-------------|
 | <kbd>Command</kbd> + <kbd>p</kbd>     | <kbd>Control</kbd> + <kbd>p</kbd> | Search for, and then open another file for editing. |
 | <kbd>Command</kbd> + <kbd>Enter</kbd> | <kbd>Control</kbd> + <kbd>Enter</kbd> | Commit (when editing the commit message). |
 
@@ -148,8 +159,8 @@ page (go to **Repository > Graph**):
 
 This shortcut is available when viewing a [wiki page](project/wiki/index.md):
 
-| Keyboard shortcut | Description |
-|-------------------|-------------|
+| Keyboard shortcut | Description     |
+|-------------------|-----------------|
 | <kbd>e</kbd>      | Edit wiki page. |
 
 ### Content editor
@@ -194,13 +205,13 @@ These shortcuts are available when editing a file with the
 
 #### Text selection
 
-| macOS shortcut | Windows shortcut | Description |
-|----------------|------------------|-------------|
-| <kbd>Command</kbd> + <kbd>a</kbd>     | <kbd>Control</kbd> + <kbd>a</kbd> | Select all |
-| <kbd>Shift</kbd> + <kbd>←</kbd> | <kbd>Shift</kbd> + <kbd>←</kbd> | Extend selection one character to left |
-| <kbd>Shift</kbd> + <kbd>→</kbd> | <kbd>Shift</kbd> + <kbd>→</kbd> | Extend selection one character to right |
-| <kbd>Shift</kbd> + <kbd>↑</kbd> | <kbd>Shift</kbd> + <kbd>↑</kbd> | Extend selection one line up |
-| <kbd>Shift</kbd> + <kbd>↓</kbd> | <kbd>Shift</kbd> + <kbd>↓</kbd> | Extend selection one line down |
+| macOS shortcut                    | Windows shortcut                  | Description |
+|-----------------------------------|-----------------------------------|-------------|
+| <kbd>Command</kbd> + <kbd>a</kbd> | <kbd>Control</kbd> + <kbd>a</kbd> | Select all |
+| <kbd>Shift</kbd> + <kbd>←</kbd>   | <kbd>Shift</kbd> + <kbd>←</kbd>   | Extend selection one character to left |
+| <kbd>Shift</kbd> + <kbd>→</kbd>   | <kbd>Shift</kbd> + <kbd>→</kbd>   | Extend selection one character to right |
+| <kbd>Shift</kbd> + <kbd>↑</kbd>   | <kbd>Shift</kbd> + <kbd>↑</kbd>   | Extend selection one line up |
+| <kbd>Shift</kbd> + <kbd>↓</kbd>   | <kbd>Shift</kbd> + <kbd>↓</kbd>   | Extend selection one line down |
 | <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>↑</kbd> | <kbd>Control</kbd> + <kbd>Shift</kbd> + <kbd>↑</kbd> | Extend selection to the beginning of the document |
 | <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>↓</kbd> | <kbd>Control</kbd> + <kbd>Shift</kbd> + <kbd>↓</kbd>  | Extend selection to the end of the document |
 
@@ -217,11 +228,23 @@ These shortcuts are available when using a [filtered search input](search/index.
 
 These shortcuts are available when viewing [epics](group/epics/index.md):
 
-| Keyboard shortcut | Description |
-|-------------------|-------------|
+| Keyboard shortcut | Description       |
+|-------------------|-------------------|
 | <kbd>r</kbd>      | Start writing a comment. Pre-selected text is quoted in the comment. Can't be used to reply in a thread. |
 | <kbd>e</kbd>      | Edit description. |
-| <kbd>l</kbd>      | Change label. |
+| <kbd>l</kbd>      | Change label.     |
+
+## Metrics
+
+These shortcuts are available when using metrics:
+
+| Keyboard shortcut | Description         |
+|-------------------|---------------------|
+| <kbd>e</kbd>      | Expand panel.       |
+| <kbd>l</kbd>      | View logs.          |
+| <kbd>d</kbd>      | Download CSV.       |
+| <kbd>c</kbd>      | Copy link to chart. |
+| <kbd>a</kbd>      | Alerts.             |
 
 ## Disable keyboard shortcuts
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/design_management/add_design_content_spec.rb b/qa/qa/specs/features/browser_ui/3_create/design_management/add_design_content_spec.rb
index b7284f972ef..5f896c7bf10 100644
--- a/qa/qa/specs/features/browser_ui/3_create/design_management/add_design_content_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/design_management/add_design_content_spec.rb
@@ -12,7 +12,7 @@ module QA
         Flow::Login.sign_in
       end
 
-      it 'user adds a design and annotates it', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/352746', type: :investigating }, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347822' do
+      it 'user adds a design and annotates it', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347822' do
         issue.visit!
 
         Page::Project::Issue::Show.perform do |issue|