Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

5 files changed, 25 insertions, 22 deletions

diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
index af0235bfc69..8008b85bbdb 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
@@ -31,10 +31,6 @@ export default {
       type: Object,
       required: true,
     },
-    enableLabelPermalinks: {
-      type: Boolean,
-      required: true,
-    },
     labelFilterParam: {
       type: String,
       required: false,
@@ -121,7 +117,10 @@ export default {
     },
     showIssuableMeta() {
       return Boolean(
-        this.hasSlotContents('status') || this.showDiscussions || this.issuable.assignees,
+        this.hasSlotContents('status') ||
+          this.hasSlotContents('statistics') ||
+          this.showDiscussions ||
+          this.issuable.assignees,
       );
     },
     issuableNotesLink() {
@@ -139,11 +138,8 @@ export default {
       return label.title || label.name;
     },
     labelTarget(label) {
-      if (this.enableLabelPermalinks) {
-        const value = encodeURIComponent(this.labelTitle(label));
-        return `?${this.labelFilterParam}[]=${value}`;
-      }
-      return '#';
+      const value = encodeURIComponent(this.labelTitle(label));
+      return `?${this.labelFilterParam}[]=${value}`;
     },
     /**
      * This is needed as an independent method since
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
index 2f8401b45f0..028d48e7e8a 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_list_root.vue
@@ -15,6 +15,7 @@ const VueDraggable = () => import('vuedraggable');
 export default {
   vueDraggableAttributes: {
     animation: 200,
+    forceFallback: true,
     ghostClass: 'gl-visibility-hidden',
     tag: 'ul',
   },
@@ -78,6 +79,11 @@ export default {
       required: false,
       default: null,
     },
+    truncateCounts: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     currentTab: {
       type: String,
       required: true,
@@ -127,11 +133,6 @@ export default {
       required: false,
       default: 2,
     },
-    enableLabelPermalinks: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
     labelFilterParam: {
       type: String,
       required: false,
@@ -261,6 +262,7 @@ export default {
       :tabs="tabs"
       :tab-counts="tabCounts"
       :current-tab="currentTab"
+      :truncate-counts="truncateCounts"
       @click="$emit('click-tab', $event)"
     >
       <template #nav-actions>
@@ -314,7 +316,6 @@ export default {
           :data-qa-issuable-title="issuable.title"
           :issuable-symbol="issuableSymbol"
           :issuable="issuable"
-          :enable-label-permalinks="enableLabelPermalinks"
           :label-filter-param="labelFilterParam"
           :show-checkbox="showBulkEditSidebar"
           :checked="issuableChecked(issuable)"
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
index 9bf54e98cc4..0691bc02b5c 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_tabs.vue
@@ -1,5 +1,6 @@
 <script>
 import { GlTabs, GlTab, GlBadge } from '@gitlab/ui';
+import { numberToMetricPrefix } from '~/lib/utils/number_utils';
 import { formatNumber } from '~/locale';
 
 export default {
@@ -22,6 +23,11 @@ export default {
       type: String,
       required: true,
     },
+    truncateCounts: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   methods: {
     isTabActive(tabName) {
@@ -31,7 +37,7 @@ export default {
       return Number.isInteger(this.tabCounts[tab.name]);
     },
     formatNumber(count) {
-      return formatNumber(count);
+      return this.truncateCounts ? numberToMetricPrefix(count) : formatNumber(count);
     },
   },
 };
diff --git a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
index d7da533d055..ee7e113af72 100644
--- a/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
+++ b/app/assets/javascripts/vue_shared/issuable/show/components/issuable_header.vue
@@ -102,7 +102,7 @@ export default {
           </div>
         </div>
         <span>
-          {{ __('Opened') }}
+          {{ __('Created') }}
           <time-ago-tooltip data-testid="startTimeItem" :time="createdAt" />
           {{ __('by') }}
         </span>
diff --git a/app/assets/javascripts/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue b/app/assets/javascripts/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue
index 99dcccd12ed..774267639fc 100644
--- a/app/assets/javascripts/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue
+++ b/app/assets/javascripts/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue
@@ -1,8 +1,8 @@
 <script>
 import { GlIcon } from '@gitlab/ui';
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
-import Cookies from 'js-cookie';
-import { parseBoolean } from '~/lib/utils/common_utils';
+import { getCookie, setCookie, parseBoolean } from '~/lib/utils/common_utils';
+
 import { USER_COLLAPSED_GUTTER_COOKIE } from '../constants';
 
 export default {
@@ -10,7 +10,7 @@ export default {
     GlIcon,
   },
   data() {
-    const userExpanded = !parseBoolean(Cookies.get(USER_COLLAPSED_GUTTER_COOKIE));
+    const userExpanded = !parseBoolean(getCookie(USER_COLLAPSED_GUTTER_COOKIE));
 
     // We're deliberately keeping two different props for sidebar status;
     // 1. userExpanded reflects value based on cookie `collapsed_gutter`.
@@ -46,7 +46,7 @@ export default {
       this.isExpanded = !this.isExpanded;
       this.userExpanded = this.isExpanded;
 
-      Cookies.set(USER_COLLAPSED_GUTTER_COOKIE, !this.userExpanded);
+      setCookie(USER_COLLAPSED_GUTTER_COOKIE, !this.userExpanded);
       this.updatePageContainerClass();
     },
   },