diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:37 +0300 |
| commit | a210c43e0aca0311cc1d3d381763b25979ec72dc (patch) | |
| tree | 0325d173da7a6e7bd6c2cdf450d0aa1c4e142d0f /app/assets/javascripts/clusters_list | |
| parent | c9687bdf58e9d4a9c3942f587bd4841f42e3b5de (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters_list')
| -rw-r--r-- | app/assets/javascripts/clusters_list/components/clusters.vue | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/clusters_list/components/clusters.vue b/app/assets/javascripts/clusters_list/components/clusters.vue index f9f23fd556f..46dacf30f39 100644 --- a/app/assets/javascripts/clusters_list/components/clusters.vue +++ b/app/assets/javascripts/clusters_list/components/clusters.vue @@ -28,6 +28,10 @@ export default { label: __('Size'), }, { + key: 'cpu', + label: __('Total cores (vCPUs)'), + }, + { key: 'memory', label: __('Total memory (GB)'), }, |