Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 13 deletions

diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
index 80bca536b7c..23d8e97dd79 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
@@ -3,7 +3,6 @@ import { GlTooltipDirective, GlIcon, GlSprintf, GlSkeletonLoader, GlButton } fro
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { n__ } from '~/locale';
 import Tracking from '~/tracking';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
 import { joinPaths } from '~/lib/utils/url_utility';
@@ -38,7 +37,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [Tracking.mixin(), glFeatureFlagsMixin()],
+  mixins: [Tracking.mixin()],
   inject: ['config'],
   props: {
     item: {
@@ -91,17 +90,14 @@ export default {
       );
     },
     imageName() {
-      if (this.glFeatures.containerRegistryShowShortenedPath) {
-        if (this.showFullPath) {
-          return this.item.path;
-        }
-        const projectPath = this.item?.project?.path?.toLowerCase() ?? '';
-        if (this.item.name) {
-          return joinPaths(projectPath, this.item.name);
-        }
-        return projectPath;
+      if (this.showFullPath) {
+        return this.item.path;
       }
-      return this.item.path;
+      const projectPath = this.item?.project?.path?.toLowerCase() ?? '';
+      if (this.item.name) {
+        return joinPaths(projectPath, this.item.name);
+      }
+      return projectPath;
     },
     routerLinkEvent() {
       return this.deleting ? '' : 'click';
@@ -136,7 +132,7 @@ export default {
   >
     <template #left-primary>
       <gl-button
-        v-if="glFeatures.containerRegistryShowShortenedPath && !showFullPath"
+        v-if="!showFullPath"
         v-gl-tooltip="{
           placement: 'top',
           title: $options.i18n.IMAGE_FULL_PATH_LABEL,