Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 43 deletions

diff --git a/app/assets/javascripts/registry/explorer/components/details_page/tags_list_row.vue b/app/assets/javascripts/registry/explorer/components/details_page/tags_list_row.vue
index a4c497d0f59..661213733ac 100644
--- a/app/assets/javascripts/registry/explorer/components/details_page/tags_list_row.vue
+++ b/app/assets/javascripts/registry/explorer/components/details_page/tags_list_row.vue
@@ -7,7 +7,7 @@ import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
 import DeleteButton from '../delete_button.vue';
-import DetailsRow from '~/registry/shared/components/details_row.vue';
+import DetailsRow from '~/vue_shared/components/registry/details_row.vue';
 import {
   REMOVE_TAG_BUTTON_TITLE,
   DIGEST_LABEL,
diff --git a/app/assets/javascripts/registry/shared/components/details_row.vue b/app/assets/javascripts/registry/shared/components/details_row.vue
deleted file mode 100644
index 2e245fadead..00000000000
--- a/app/assets/javascripts/registry/shared/components/details_row.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-import { GlIcon } from '@gitlab/ui';
-
-export default {
-  components: {
-    GlIcon,
-  },
-  props: {
-    icon: {
-      type: String,
-      required: true,
-    },
-    padding: {
-      type: String,
-      default: 'gl-py-2',
-      required: false,
-    },
-    dashed: {
-      type: Boolean,
-      default: false,
-      required: false,
-    },
-  },
-  computed: {
-    borderClass() {
-      return this.dashed ? 'gl-border-b-solid gl-border-gray-100 gl-border-b-1' : '';
-    },
-  },
-};
-</script>
-
-<template>
-  <div
-    class="gl-display-flex gl-align-items-center gl-font-monospace gl-font-sm gl-word-break-all"
-    :class="[padding, borderClass]"
-  >
-    <gl-icon :name="icon" class="gl-mr-4" />
-    <span>
-      <slot></slot>
-    </span>
-  </div>
-</template>