diff options
author | Sean McGivern <sean@gitlab.com> | 2019-08-02 12:42:00 +0000 |
---|---|---|
committer | 🤖 GitLab Bot 🤖 <gitlab-bot@gitlab.com> | 2019-08-02 18:21:19 +0000 |
commit | c71e0e724cfe09a75875a9b620bada8dde64378e (patch) | |
tree | 60e8c3402b1871c10048e197cb3084a0a22f03cc | |
parent | c3fe0c2577a1f6289b7e77e88b22b04e64cf2d12 (diff) | |
download | gitlab-ce-12-2-auto-deploy-20190730.tar.gz |
Merge branch 'sh-fix-performance-bar-warnings' into 'master'12-2-auto-deploy-20190730
Fix performance bar warnings when Rugged is disabled
Closes #65491
See merge request gitlab-org/gitlab-ce!31395
(cherry picked from commit 2d72602b7ee426ad605312c80dc38793ce41b911)
65f18888 Fix performance bar warnings when Rugged is disabled
-rw-r--r-- | app/assets/javascripts/performance_bar/components/detailed_metric.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/performance_bar/components/detailed_metric.vue b/app/assets/javascripts/performance_bar/components/detailed_metric.vue index 5bc1d5e0533..73524827c5d 100644 --- a/app/assets/javascripts/performance_bar/components/detailed_metric.vue +++ b/app/assets/javascripts/performance_bar/components/detailed_metric.vue @@ -44,7 +44,7 @@ export default { </script> <template> <div - v-if="currentRequest.details" + v-if="currentRequest.details && metricDetails" :id="`peek-view-${metric}`" class="view qa-performance-bar-detailed-metric" > |