diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-30 12:56:59 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-30 12:56:59 +0000 |
| commit | 1c2e7af6afa4be48c4d95e3b5de8005746db9bc7 (patch) | |
| tree | f5f5a66a243aad501ad8715a021c161b50005013 /app/views | |
| parent | 8b675291821455d755fdeef7b2bdd0c99ce0f32f (diff) | |
| parent | 98238a27c7b0e5d4c7a674a78c859150966e6f8b (diff) | |
| download | gitlab-ce-1c2e7af6afa4be48c4d95e3b5de8005746db9bc7.tar.gz | |
Merge branch 'issue-18886' into 'master'
Loop all disks when displaying system info. Closes #18886
See merge request !4983
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/system_info/show.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml index 3ef2f20b589..1bf0ac1ff75 100644 --- a/app/views/admin/system_info/show.html.haml +++ b/app/views/admin/system_info/show.html.haml @@ -17,6 +17,9 @@ %h1= "#{number_to_human_size(@mem_used)} / #{number_to_human_size(@mem_total)}" .col-sm-4 .light-well - %h4 Disk + %h4 Disks .data - %h1= "#{number_to_human_size(@disk_used)} / #{number_to_human_size(@disk_total)}" + - @disks.each do |disk| + %h1= "#{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}" + %p= "#{disk[:disk_name]}" + %p= "#{disk[:mount_path]}" |