Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 45 deletions

diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
index a88cc1834ac..bd13bcb35fc 100644
--- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js
+++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js
@@ -321,12 +321,6 @@ export const GO_TO_PROJECT_JOBS = {
   defaultKeys: ['g j'], // eslint-disable-line @gitlab/require-i18n-strings
 };
 
-export const GO_TO_PROJECT_METRICS = {
-  id: 'project.goToMetrics',
-  description: __('Go to metrics'),
-  defaultKeys: ['g l'], // eslint-disable-line @gitlab/require-i18n-strings
-};
-
 export const GO_TO_PROJECT_ENVIRONMENTS = {
   id: 'project.goToEnvironments',
   description: __('Go to environments'),
@@ -506,30 +500,6 @@ const WEB_IDE_COMMIT = {
   customizable: false,
 };
 
-export const METRICS_EXPAND_PANEL = {
-  id: 'metrics.expandPanel',
-  description: __('Expand panel'),
-  defaultKeys: ['e'],
-};
-
-export const METRICS_DOWNLOAD_CSV = {
-  id: 'metrics.downloadCSV',
-  description: __('Download CSV'),
-  defaultKeys: ['d'],
-};
-
-export const METRICS_COPY_LINK_TO_CHART = {
-  id: 'metrics.copyLinkToChart',
-  description: __('Copy link to chart'),
-  defaultKeys: ['c'],
-};
-
-export const METRICS_SHOW_ALERTS = {
-  id: 'metrics.showAlerts',
-  description: __('Alerts'),
-  defaultKeys: ['a'],
-};
-
 // All keybinding groups
 const GLOBAL_SHORTCUTS_GROUP = {
   id: 'globalShortcuts',
@@ -606,7 +576,6 @@ const PROJECT_SHORTCUTS_GROUP = {
     GO_TO_PROJECT_MERGE_REQUESTS,
     GO_TO_PROJECT_PIPELINES,
     GO_TO_PROJECT_JOBS,
-    ...(gon.features?.removeMonitorMetrics ? [] : [GO_TO_PROJECT_METRICS]),
     GO_TO_PROJECT_ENVIRONMENTS,
     GO_TO_PROJECT_KUBERNETES,
     GO_TO_PROJECT_SNIPPETS,
@@ -670,17 +639,6 @@ const WEB_IDE_SHORTCUTS_GROUP = {
   keybindings: [WEB_IDE_GO_TO_FILE, WEB_IDE_COMMIT],
 };
 
-const METRICS_SHORTCUTS_GROUP = {
-  id: 'metrics',
-  name: __('Metrics'),
-  keybindings: [
-    METRICS_EXPAND_PANEL,
-    METRICS_DOWNLOAD_CSV,
-    METRICS_COPY_LINK_TO_CHART,
-    METRICS_SHOW_ALERTS,
-  ],
-};
-
 export const MISC_SHORTCUTS_GROUP = {
   id: 'misc',
   name: __('Miscellaneous'),
@@ -701,7 +659,6 @@ export const keybindingGroups = [
   MR_COMMITS_SHORTCUTS_GROUP,
   ISSUES_SHORTCUTS_GROUP,
   WEB_IDE_SHORTCUTS_GROUP,
-  ...(gon.features?.removeMonitorMetrics ? [] : [METRICS_SHORTCUTS_GROUP]),
   MISC_SHORTCUTS_GROUP,
 ];
 
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js
index 9e6c9c2e08e..d9dc3aae808 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js
@@ -17,7 +17,6 @@ import {
   GO_TO_PROJECT_SNIPPETS,
   GO_TO_PROJECT_KUBERNETES,
   GO_TO_PROJECT_ENVIRONMENTS,
-  GO_TO_PROJECT_METRICS,
   GO_TO_PROJECT_WEBIDE,
   NEW_ISSUE,
 } from './keybindings';
@@ -44,7 +43,6 @@ export default class ShortcutsNavigation extends Shortcuts {
       [GO_TO_PROJECT_SNIPPETS, () => findAndFollowLink('.shortcuts-snippets')],
       [GO_TO_PROJECT_KUBERNETES, () => findAndFollowLink('.shortcuts-kubernetes')],
       [GO_TO_PROJECT_ENVIRONMENTS, () => findAndFollowLink('.shortcuts-environments')],
-      [GO_TO_PROJECT_METRICS, () => findAndFollowLink('.shortcuts-metrics')],
       [GO_TO_PROJECT_WEBIDE, ShortcutsNavigation.navigateToWebIDE],
       [NEW_ISSUE, () => findAndFollowLink('.shortcuts-new-issue')],
     ]);