Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 5 insertions, 4 deletions

diff --git a/app/assets/javascripts/performance_bar/components/detailed_metric.vue b/app/assets/javascripts/performance_bar/components/detailed_metric.vue
index 04efc459a21..f163a7c3a8e 100644
--- a/app/assets/javascripts/performance_bar/components/detailed_metric.vue
+++ b/app/assets/javascripts/performance_bar/components/detailed_metric.vue
@@ -27,9 +27,7 @@ export default {
     title: {
       type: String,
       required: false,
-      default() {
-        return this.metric;
-      },
+      default: null,
     },
     header: {
       type: String,
@@ -101,6 +99,9 @@ export default {
 
       return '';
     },
+    actualTitle() {
+      return this.title ?? this.metric;
+    },
   },
   methods: {
     toggleBacktrace(toggledIndex) {
@@ -214,7 +215,7 @@ export default {
         <div></div>
       </template>
     </gl-modal>
-    {{ title }}
+    {{ actualTitle }}
     <request-warning :html-id="htmlId" :warnings="warnings" />
   </div>
 </template>