Add latest changes from gitlab-org/gitlab@master

4 files changed, 2 insertions, 69 deletions

diff --git a/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_app.vue b/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_app.vue
deleted file mode 100644
index ee2fe00fe02..00000000000
--- a/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_app.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<script>
-import DevopsAdoptionEmptyState from './devops_adoption_empty_state.vue';
-
-export default {
-  name: 'DevopsAdoptionApp',
-  components: {
-    DevopsAdoptionEmptyState,
-  },
-};
-</script>
-<template>
-  <devops-adoption-empty-state />
-</template>
diff --git a/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_empty_state.vue b/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_empty_state.vue
deleted file mode 100644
index 0fff9beb435..00000000000
--- a/app/assets/javascripts/admin/dev_ops_report/components/devops_adoption_empty_state.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<script>
-import { GlEmptyState, GlButton } from '@gitlab/ui';
-import { DEVOPS_ADOPTION_STRINGS } from '../constants';
-
-export default {
-  name: 'DevopsAdoptionEmptyState',
-  inject: ['emptyStateSvgPath'],
-  components: {
-    GlEmptyState,
-    GlButton,
-  },
-  i18n: DEVOPS_ADOPTION_STRINGS.emptyState,
-};
-</script>
-<template>
-  <gl-empty-state
-    :title="$options.i18n.title"
-    :description="$options.i18n.description"
-    :svg-path="emptyStateSvgPath"
-  >
-    <template #actions>
-      <gl-button variant="info">{{ $options.i18n.button }}</gl-button>
-    </template>
-  </gl-empty-state>
-</template>
diff --git a/app/assets/javascripts/admin/dev_ops_report/constants.js b/app/assets/javascripts/admin/dev_ops_report/constants.js
deleted file mode 100644
index 4f3b7879332..00000000000
--- a/app/assets/javascripts/admin/dev_ops_report/constants.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { s__ } from '~/locale';
-
-export const DEVOPS_ADOPTION_STRINGS = {
-  emptyState: {
-    title: s__('DevopsAdoption|Add a segment to get started'),
-    description: s__(
-      'DevopsAdoption|DevOps adoption uses segments to track adoption across key features. Segments are a way to track multiple related projects and groups at once. For example, you could create a segment for the engineering department or a particular product team.',
-    ),
-    button: s__('DevopsAdoption|Add new segment'),
-  },
-};
diff --git a/app/assets/javascripts/admin/dev_ops_report/devops_adoption.js b/app/assets/javascripts/admin/dev_ops_report/devops_adoption.js
index 45901a5634f..ae73033079d 100644
--- a/app/assets/javascripts/admin/dev_ops_report/devops_adoption.js
+++ b/app/assets/javascripts/admin/dev_ops_report/devops_adoption.js
@@ -1,20 +1,2 @@
-import Vue from 'vue';
-import DevopsAdoptionApp from './components/devops_adoption_app.vue';
-
-export default () => {
-  const el = document.querySelector('.js-devops-adoption');
-
-  if (!el) return false;
-
-  const { emptyStateSvgPath } = el.dataset;
-
-  return new Vue({
-    el,
-    provide: {
-      emptyStateSvgPath,
-    },
-    render(h) {
-      return h(DevopsAdoptionApp);
-    },
-  });
-};
+// EE-specific feature. Find the implementation in the `ee/`-folder
+export default () => {};