Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 3 deletions

diff --git a/app/assets/javascripts/cycle_analytics/components/value_stream_metrics.vue b/app/assets/javascripts/cycle_analytics/components/value_stream_metrics.vue
index 9671742e564..b090c245559 100644
--- a/app/assets/javascripts/cycle_analytics/components/value_stream_metrics.vue
+++ b/app/assets/javascripts/cycle_analytics/components/value_stream_metrics.vue
@@ -92,9 +92,14 @@ export default {
 <template>
   <div class="gl-display-flex gl-flex-wrap" data-testid="vsa-time-metrics">
     <gl-skeleton-loading v-if="isLoading" class="gl-h-auto gl-py-3 gl-pr-9 gl-my-6" />
-    <div v-for="metric in metrics" v-show="!isLoading" :key="metric.key" class="gl-my-6 gl-pr-9">
+    <div
+      v-for="metric in metrics"
+      v-show="!isLoading"
+      :key="metric.identifier"
+      class="gl-my-6 gl-pr-9"
+    >
       <gl-single-stat
-        :id="metric.key"
+        :id="metric.identifier"
         :value="`${metric.value}`"
         :title="metric.label"
         :unit="metric.unit || ''"
@@ -104,7 +109,7 @@ export default {
         tabindex="0"
         @click="clickHandler(metric)"
       />
-      <metric-popover :metric="metric" :target="metric.key" />
+      <metric-popover :metric="metric" :target="metric.identifier" />
     </div>
   </div>
 </template>