Add latest changes from gitlab-org/gitlab@master

6 files changed, 9 insertions, 29 deletions

diff --git a/app/assets/javascripts/pages/admin/clusters/show/index.js b/app/assets/javascripts/pages/admin/clusters/show/index.js
index ccf631b2c53..8001d2dd1da 100644
--- a/app/assets/javascripts/pages/admin/clusters/show/index.js
+++ b/app/assets/javascripts/pages/admin/clusters/show/index.js
@@ -1,7 +1,5 @@
 import ClustersBundle from '~/clusters/clusters_bundle';
-import initClusterHealth from '~/pages/projects/clusters/show/cluster_health';
 
 document.addEventListener('DOMContentLoaded', () => {
   new ClustersBundle(); // eslint-disable-line no-new
-  initClusterHealth();
 });
diff --git a/app/assets/javascripts/pages/groups/clusters/show/index.js b/app/assets/javascripts/pages/groups/clusters/show/index.js
index ccf631b2c53..8001d2dd1da 100644
--- a/app/assets/javascripts/pages/groups/clusters/show/index.js
+++ b/app/assets/javascripts/pages/groups/clusters/show/index.js
@@ -1,7 +1,5 @@
 import ClustersBundle from '~/clusters/clusters_bundle';
-import initClusterHealth from '~/pages/projects/clusters/show/cluster_health';
 
 document.addEventListener('DOMContentLoaded', () => {
   new ClustersBundle(); // eslint-disable-line no-new
-  initClusterHealth();
 });
diff --git a/app/assets/javascripts/pages/projects/clusters/show/cluster_health.js b/app/assets/javascripts/pages/projects/clusters/show/cluster_health.js
deleted file mode 100644
index 382d39645a9..00000000000
--- a/app/assets/javascripts/pages/projects/clusters/show/cluster_health.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import monitoringApp from '~/monitoring/monitoring_app';
-
-export default () => {
-  const el = document.getElementById('prometheus-graphs');
-
-  if (el && el.dataset) {
-    monitoringApp({
-      ...el.dataset,
-      showLegend: false,
-      showHeader: false,
-      showPanels: false,
-      forceSmallGraph: true,
-      smallEmptyState: true,
-      currentEnvironmentName: '',
-      hasMetrics: true,
-    });
-  }
-};
diff --git a/app/assets/javascripts/pages/projects/clusters/show/index.js b/app/assets/javascripts/pages/projects/clusters/show/index.js
index d20e2c19583..397f9faf6fe 100644
--- a/app/assets/javascripts/pages/projects/clusters/show/index.js
+++ b/app/assets/javascripts/pages/projects/clusters/show/index.js
@@ -1,9 +1,7 @@
 import ClustersBundle from '~/clusters/clusters_bundle';
 import initGkeNamespace from '~/create_cluster/gke_cluster_namespace';
-import initClusterHealth from './cluster_health';
 
 document.addEventListener('DOMContentLoaded', () => {
   new ClustersBundle(); // eslint-disable-line no-new
   initGkeNamespace();
-  initClusterHealth();
 });
diff --git a/app/assets/javascripts/vue_shared/components/gl_modal_vuex.vue b/app/assets/javascripts/vue_shared/components/gl_modal_vuex.vue
index df6fadf10cd..e14f6a04d3c 100644
--- a/app/assets/javascripts/vue_shared/components/gl_modal_vuex.vue
+++ b/app/assets/javascripts/vue_shared/components/gl_modal_vuex.vue
@@ -52,6 +52,14 @@ export default {
       // $root.$emit is a workaround because other b-modal approaches don't work yet with gl-modal
       this.$root.$emit('bv::hide::modal', this.modalId);
     },
+    cancel() {
+      this.$emit('cancel');
+      this.syncHide();
+    },
+    ok() {
+      this.$emit('ok');
+      this.syncHide();
+    },
   },
 };
 </script>
@@ -65,5 +73,6 @@ export default {
     @hidden="syncHide"
   >
     <slot></slot>
+    <slot slot="modal-footer" name="modal-footer" :ok="ok" :cancel="cancel"></slot>
   </gl-modal>
 </template>
diff --git a/app/assets/stylesheets/pages/alert_management/list.scss b/app/assets/stylesheets/pages/alert_management/list.scss
index 27c7b088fe0..ea5e7a1bdea 100644
--- a/app/assets/stylesheets/pages/alert_management/list.scss
+++ b/app/assets/stylesheets/pages/alert_management/list.scss
@@ -1,9 +1,4 @@
 .alert-management-list {
-  // Migrate this to gitlab-ui
-  .gl-w-12 {
-    width: $gl-spacing-scale-12;
-  }
-
   // these styles need to be deleted once GlTable component looks in GitLab same as in @gitlab/ui
   table {
     color: $gray-700;