Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-26 12:11:02 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-26 12:11:02 +0300
commit47d07def1648ffc0787fe92ea5e351ccc5e9c4a4 (patch)
treea2d320f623a4f355049326b9e02ed74a3d3e9240 /app/assets/javascripts/performance_bar
parent8bc752f208ea3c2c3218eb407033bd47471c2df5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/performance_bar')
-rw-r--r--app/assets/javascripts/performance_bar/components/performance_bar_app.vue5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
index ebe9c4eee2f..1bb847217d1 100644
--- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
+++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue
@@ -74,6 +74,11 @@ export default {
keys: ['label', 'code', 'proxy', 'error'],
},
{
+ metric: 'memory',
+ header: s__('PerformanceBar|Memory'),
+ keys: ['item_header', 'item_content'],
+ },
+ {
metric: 'total',
header: s__('PerformanceBar|Frontend resources'),
keys: ['name', 'size'],