Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 0 deletions

diff --git a/app/assets/javascripts/cycle_analytics/components/base.vue b/app/assets/javascripts/cycle_analytics/components/base.vue
index 735d8f26794..1883030e51f 100644
--- a/app/assets/javascripts/cycle_analytics/components/base.vue
+++ b/app/assets/javascripts/cycle_analytics/components/base.vue
@@ -3,6 +3,7 @@ import { GlLoadingIcon } from '@gitlab/ui';
 import { mapActions, mapState, mapGetters } from 'vuex';
 import { getCookie, setCookie } from '~/lib/utils/common_utils';
 import ValueStreamMetrics from '~/analytics/shared/components/value_stream_metrics.vue';
+import { VSA_METRICS_GROUPS } from '~/analytics/shared/constants';
 import { toYmd } from '~/analytics/shared/utils';
 import PathNavigation from '~/cycle_analytics/components/path_navigation.vue';
 import StageTable from '~/cycle_analytics/components/stage_table.vue';
@@ -150,6 +151,7 @@ export default {
     pageTitle: __('Value Stream Analytics'),
     recentActivity: __('Recent Project Activity'),
   },
+  VSA_METRICS_GROUPS,
 };
 </script>
 <template>
@@ -178,6 +180,7 @@ export default {
       :request-path="endpoints.fullPath"
       :request-params="filterParams"
       :requests="metricsRequests"
+      :group-by="$options.VSA_METRICS_GROUPS"
     />
     <gl-loading-icon v-if="isLoading" size="lg" />
     <stage-table