diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-30 10:44:03 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-30 10:44:03 +0300 |
| commit | 1d8de967a1ef9235891ab5a6b9a654280f8a5cbf (patch) | |
| tree | c7a152660179e32cb0eb85c232c7d9f1ebd6eb96 /app | |
| parent | 77ba9a547bb9fb000a2381d945a3e1b74706cec9 (diff) | |
| parent | f547a473d80288757d8ce8d8d7ba11df616b691d (diff) | |
Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'
31616-add-uptime-of-gitlab-instance-in-admin-area
Closes #31616
See merge request !11590
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/system_info/show.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml index 2e5f120c4e4..9b9559c7fe5 100644 --- a/app/views/admin/system_info/show.html.haml +++ b/app/views/admin/system_info/show.html.haml @@ -31,3 +31,8 @@ %h1 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])} %p= disk[:disk_name] %p= disk[:mount_path] + .col-sm-4 + .light-well + %h4 Uptime + .data + %h1= time_ago_with_tooltip(Rails.application.config.booted_at) |