summaryrefslogtreecommitdiff
path: root/app/views/admin/system_info
diff options
context:
space:
mode:
authorJosh Frye <joshfng@gmail.com>2016-06-23 10:37:20 -0400
committerJosh Frye <joshfng@gmail.com>2016-06-28 21:35:42 -0400
commit13ba3bd4fdaa59b2836efa907433d5e807ed5d5e (patch)
tree0151d7d986f640fbcaa2180d7faff647d08376cf /app/views/admin/system_info
parent242aa5bd66038e5c7393f17be51a73deaedd7d06 (diff)
downloadgitlab-ce-13ba3bd4fdaa59b2836efa907433d5e807ed5d5e.tar.gz
Use number_to_human_size for system info and remove dependency on Filesize gem.
Diffstat (limited to 'app/views/admin/system_info')
-rw-r--r--app/views/admin/system_info/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 316a94f4d41..542498cfb22 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -14,9 +14,9 @@
.light-well
%h4 Memory
.data
- %h1= "#{@mem_used}GB / #{@mem_total}GB"
+ %h1= "#{number_to_human_size(@mem_used)} / #{number_to_human_size(@mem_total)}"
.col-sm-4
.light-well
%h4 Disk
.data
- %h1= "#{@disk_used}GB / #{@disk_total}GB"
+ %h1= "#{number_to_human_size(@disk_used)} / #{number_to_human_size(@disk_total)}"