diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 12:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 12:09:48 +0300 |
| commit | 3f3e4bcc50a3280d03299c2c263eafd9c8e3bd7b (patch) | |
| tree | eccfc6b87b404f2871cc795bf2f7223a7e391939 /app/assets/javascripts/clusters_list | |
| parent | 65a1175e466105fca1f40cb5a995fdb100ff334e (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 a1b581dc627..f9f23fd556f 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: 'memory', + label: __('Total memory (GB)'), + }, + { key: 'clusterType', label: __('Cluster level'), formatter: value => CLUSTER_TYPES[value], |