Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

9 files changed, 46 insertions, 13 deletions

diff --git a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
index e873edaad3b..98503636d33 100644
--- a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
+++ b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
@@ -9,6 +9,8 @@ exports[`Dashboard template matches the default snapshot 1`] = `
   metricsendpoint="/monitoring/monitor-project/-/environments/1/additional_metrics.json"
   prometheusstatus=""
 >
+  <alerts-deprecation-warning-stub />
+   
   <div
     class="prometheus-graphs-header d-sm-flex flex-sm-wrap pt-2 pr-1 pb-0 pl-2 border-bottom bg-gray-light"
   >
diff --git a/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js b/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js
index 400ac2e8f85..8af6075a416 100644
--- a/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js
@@ -28,6 +28,7 @@ describe('dashboard invalid url parameters', () => {
         },
       },
       options,
+      provide: { hasManagedPrometheus: false },
     });
   };
 
diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js
index 5c7042d4cb5..0c2f85c7298 100644
--- a/spec/frontend/monitoring/components/dashboard_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_spec.js
@@ -1,3 +1,4 @@
+import { GlAlert } from '@gitlab/ui';
 import { shallowMount, mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import VueDraggable from 'vuedraggable';
@@ -7,7 +8,6 @@ import axios from '~/lib/utils/axios_utils';
 import { ESC_KEY } from '~/lib/utils/keys';
 import { objectToQuery } from '~/lib/utils/url_utility';
 import Dashboard from '~/monitoring/components/dashboard.vue';
-
 import DashboardHeader from '~/monitoring/components/dashboard_header.vue';
 import DashboardPanel from '~/monitoring/components/dashboard_panel.vue';
 import EmptyState from '~/monitoring/components/empty_state.vue';
@@ -17,6 +17,7 @@ import LinksSection from '~/monitoring/components/links_section.vue';
 import { dashboardEmptyStates, metricStates } from '~/monitoring/constants';
 import { createStore } from '~/monitoring/stores';
 import * as types from '~/monitoring/stores/mutation_types';
+import AlertDeprecationWarning from '~/vue_shared/components/alerts_deprecation_warning.vue';
 import {
   metricsDashboardViewModel,
   metricsDashboardPanelCount,
@@ -46,6 +47,7 @@ describe('Dashboard', () => {
       stubs: {
         DashboardHeader,
       },
+      provide: { hasManagedPrometheus: false },
       ...options,
     });
   };
@@ -59,6 +61,9 @@ describe('Dashboard', () => {
         'dashboard-panel': true,
         'dashboard-header': DashboardHeader,
       },
+      provide: {
+        hasManagedPrometheus: false,
+      },
       ...options,
     });
   };
@@ -812,4 +817,25 @@ describe('Dashboard', () => {
       expect(dashboardPanel.exists()).toBe(true);
     });
   });
+
+  describe('deprecation notice', () => {
+    beforeEach(() => {
+      setupStoreWithData(store);
+    });
+
+    const findDeprecationNotice = () =>
+      wrapper.find(AlertDeprecationWarning).findComponent(GlAlert);
+
+    it('shows the deprecation notice when available', () => {
+      createMountedWrapper({}, { provide: { hasManagedPrometheus: true } });
+
+      expect(findDeprecationNotice().exists()).toBe(true);
+    });
+
+    it('hides the deprecation notice when not available', () => {
+      createMountedWrapper();
+
+      expect(findDeprecationNotice().exists()).toBe(false);
+    });
+  });
 });
diff --git a/spec/frontend/monitoring/components/dashboard_url_time_spec.js b/spec/frontend/monitoring/components/dashboard_url_time_spec.js
index 9830b6d047f..090613b0f1e 100644
--- a/spec/frontend/monitoring/components/dashboard_url_time_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_url_time_spec.js
@@ -31,6 +31,7 @@ describe('dashboard invalid url parameters', () => {
       store,
       stubs: { 'graph-group': true, 'dashboard-panel': true, 'dashboard-header': DashboardHeader },
       ...options,
+      provide: { hasManagedPrometheus: false },
     });
   };
 
diff --git a/spec/frontend/monitoring/components/dashboards_dropdown_spec.js b/spec/frontend/monitoring/components/dashboards_dropdown_spec.js
index c9241834789..589354e7849 100644
--- a/spec/frontend/monitoring/components/dashboards_dropdown_spec.js
+++ b/spec/frontend/monitoring/components/dashboards_dropdown_spec.js
@@ -6,7 +6,7 @@ import DashboardsDropdown from '~/monitoring/components/dashboards_dropdown.vue'
 
 import { dashboardGitResponse } from '../mock_data';
 
-const defaultBranch = 'master';
+const defaultBranch = 'main';
 const starredDashboards = dashboardGitResponse.filter(({ starred }) => starred);
 const notStarredDashboards = dashboardGitResponse.filter(({ starred }) => !starred);
 
diff --git a/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js b/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
index 51b4106d4b1..0dd3afd7c83 100644
--- a/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
+++ b/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
@@ -16,7 +16,7 @@ const createMountedWrapper = (props = {}) => {
 };
 
 describe('DuplicateDashboardForm', () => {
-  const defaultBranch = 'master';
+  const defaultBranch = 'main';
 
   const findByRef = (ref) => wrapper.find({ ref });
   const setValue = (ref, val) => {
diff --git a/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js b/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js
index 1bc89e509b5..7e7a7a66d77 100644
--- a/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js
+++ b/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js
@@ -37,7 +37,7 @@ describe('duplicate dashboard modal', () => {
 
     return shallowMount(DuplicateDashboardModal, {
       propsData: {
-        defaultBranch: 'master',
+        defaultBranch: 'main',
         modalId: 'id',
       },
       store,
diff --git a/spec/frontend/monitoring/mock_data.js b/spec/frontend/monitoring/mock_data.js
index 29a7c86491d..00be5868ba3 100644
--- a/spec/frontend/monitoring/mock_data.js
+++ b/spec/frontend/monitoring/mock_data.js
@@ -15,7 +15,7 @@ const customDashboardsData = new Array(30).fill(null).map((_, idx) => ({
   can_edit: true,
   system_dashboard: false,
   out_of_the_box_dashboard: false,
-  project_blob_path: `${mockProjectDir}/blob/master/dashboards/.gitlab/dashboards/dashboard_${idx}.yml`,
+  project_blob_path: `${mockProjectDir}/blob/main/dashboards/.gitlab/dashboards/dashboard_${idx}.yml`,
   path: `.gitlab/dashboards/dashboard_${idx}.yml`,
   starred: false,
 }));
@@ -32,7 +32,7 @@ export const anomalyDeploymentData = [
     iid: 3,
     sha: 'f5bcd1d9dac6fa4137e2510b9ccd134ef2e84187',
     ref: {
-      name: 'master',
+      name: 'main',
     },
     created_at: '2019-08-19T22:00:00.000Z',
     deployed_at: '2019-08-19T22:01:00.000Z',
@@ -44,7 +44,7 @@ export const anomalyDeploymentData = [
     iid: 2,
     sha: 'f5bcd1d9dac6fa4137e2510b9ccd134ef2e84187',
     ref: {
-      name: 'master',
+      name: 'main',
     },
     created_at: '2019-08-19T23:00:00.000Z',
     deployed_at: '2019-08-19T23:00:00.000Z',
@@ -61,7 +61,7 @@ export const deploymentData = [
     commitUrl:
       'http://test.host/frontend-fixtures/environments-project/-/commit/f5bcd1d9dac6fa4137e2510b9ccd134ef2e84187',
     ref: {
-      name: 'master',
+      name: 'main',
     },
     created_at: '2019-07-16T10:14:25.589Z',
     tag: false,
@@ -75,7 +75,7 @@ export const deploymentData = [
     commitUrl:
       'http://test.host/frontend-fixtures/environments-project/-/commit/f5bcd1d9dac6fa4137e2510b9ccd134ef2e84187',
     ref: {
-      name: 'master',
+      name: 'main',
     },
     created_at: '2019-07-16T11:14:25.589Z',
     tag: false,
@@ -187,7 +187,7 @@ export const dashboardGitResponse = [
     can_edit: true,
     system_dashboard: false,
     out_of_the_box_dashboard: false,
-    project_blob_path: `${mockProjectDir}/-/blob/master/.gitlab/dashboards/dashboard.yml`,
+    project_blob_path: `${mockProjectDir}/-/blob/main/.gitlab/dashboards/dashboard.yml`,
     path: '.gitlab/dashboards/dashboard.yml',
     starred: true,
     user_starred_path: `${mockProjectDir}/metrics_user_starred_dashboards?dashboard_path=.gitlab/dashboards/dashboard.yml`,
@@ -224,7 +224,7 @@ export const selfMonitoringDashboardGitResponse = [
     can_edit: true,
     system_dashboard: false,
     out_of_the_box_dashboard: false,
-    project_blob_path: `${mockProjectDir}/-/blob/master/.gitlab/dashboards/dashboard.yml`,
+    project_blob_path: `${mockProjectDir}/-/blob/main/.gitlab/dashboards/dashboard.yml`,
     path: '.gitlab/dashboards/dashboard.yml',
     starred: true,
     user_starred_path: `${mockProjectDir}/metrics_user_starred_dashboards?dashboard_path=.gitlab/dashboards/dashboard.yml`,
@@ -572,7 +572,7 @@ export const storeVariables = [
 ];
 
 export const dashboardHeaderProps = {
-  defaultBranch: 'master',
+  defaultBranch: 'main',
   isRearrangingPanels: false,
   selectedTimeRange: {
     start: '2020-01-01T00:00:00.000Z',
@@ -581,7 +581,7 @@ export const dashboardHeaderProps = {
 };
 
 export const dashboardActionsMenuProps = {
-  defaultBranch: 'master',
+  defaultBranch: 'main',
   addingMetricsAvailable: true,
   customMetricsPath: 'https://path/to/customMetrics',
   validateQueryPath: 'https://path/to/validateQuery',
diff --git a/spec/frontend/monitoring/router_spec.js b/spec/frontend/monitoring/router_spec.js
index b027d60f61e..2a712d4361f 100644
--- a/spec/frontend/monitoring/router_spec.js
+++ b/spec/frontend/monitoring/router_spec.js
@@ -20,6 +20,8 @@ const MockApp = {
   template: `<router-view  :dashboard-props="dashboardProps"/>`,
 };
 
+const provide = { hasManagedPrometheus: false };
+
 describe('Monitoring router', () => {
   let router;
   let store;
@@ -37,6 +39,7 @@ describe('Monitoring router', () => {
       localVue,
       store,
       router,
+      provide,
     });
   };