summaryrefslogtreecommitdiff
path: root/app/views/admin/system_info
diff options
context:
space:
mode:
authorGilbert Roulot <gilbert.roulot@gmail.com>2017-12-15 12:37:01 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-12-15 12:37:01 +0000
commitdd4b6db23ef0fa67cb98a695692b4e42136ed8a9 (patch)
tree5a27e70dda4a8a0454810356e521f2815e8104d0 /app/views/admin/system_info
parentd835bbf19a088ff8178d716c9918408912631969 (diff)
downloadgitlab-ce-dd4b6db23ef0fa67cb98a695692b4e42136ed8a9.tar.gz
Fix UX issues in system info page
Diffstat (limited to 'app/views/admin/system_info')
-rw-r--r--app/views/admin/system_info/show.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 6bf979a937e..23f9927cfee 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -15,7 +15,7 @@
Unable to collect CPU info
.col-sm-4
.light-well
- %h4 Memory
+ %h4 Memory Usage
.data
- if @memory
%h1 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)}
@@ -24,7 +24,7 @@
Unable to collect memory info
.col-sm-4
.light-well
- %h4 Disks
+ %h4 Disk Usage
.data
- @disks.each do |disk|
%h1 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])}
@@ -34,4 +34,4 @@
.light-well
%h4 Uptime
.data
- %h1= time_ago_with_tooltip(Rails.application.config.booted_at)
+ %h1= distance_of_time_in_words_to_now(Rails.application.config.booted_at)