diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/performance_bar | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/performance_bar')
-rw-r--r-- | app/assets/javascripts/performance_bar/components/detailed_metric.vue | 9 |
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> |