Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 6 deletions

diff --git a/app/assets/javascripts/cycle_analytics/components/formatted_stage_count.vue b/app/assets/javascripts/cycle_analytics/components/formatted_stage_count.vue
index 0fcfeb93e34..b622b0441e2 100644
--- a/app/assets/javascripts/cycle_analytics/components/formatted_stage_count.vue
+++ b/app/assets/javascripts/cycle_analytics/components/formatted_stage_count.vue
@@ -1,5 +1,5 @@
 <script>
-import { s__, n__, sprintf } from '~/locale';
+import { s__, n__, sprintf, formatNumber } from '~/locale';
 
 export default {
   props: {
@@ -14,10 +14,14 @@ export default {
       if (!this.stageCount) {
         return '-';
       } else if (this.stageCount > 1000) {
-        return sprintf(s__('ValueStreamAnalytics|%{stageCount} items'), { stageCount: '1000+' });
+        return sprintf(s__('ValueStreamAnalytics|%{stageCount}+ items'), {
+          stageCount: formatNumber(1000),
+        });
       }
 
-      return n__('%d item', '%d items', this.stageCount);
+      return sprintf(n__('%{count} item', '%{count} items', this.stageCount), {
+        count: formatNumber(this.stageCount),
+      });
     },
   },
 };
diff --git a/app/assets/javascripts/cycle_analytics/components/path_navigation.vue b/app/assets/javascripts/cycle_analytics/components/path_navigation.vue
index aa929e076a5..47fafc3b90c 100644
--- a/app/assets/javascripts/cycle_analytics/components/path_navigation.vue
+++ b/app/assets/javascripts/cycle_analytics/components/path_navigation.vue
@@ -46,9 +46,6 @@ export default {
     showPopover({ id }) {
       return id && id !== OVERVIEW_STAGE_ID;
     },
-    hasStageCount({ stageCount = null }) {
-      return stageCount !== null;
-    },
     onSelectStage($event) {
       this.$emit('selected', $event);
       this.track('click_path_navigation', {