Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6c044f12
Commit
6c044f12
authored
Sep 27, 2019
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve admin/system_info page ui
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
504e6929
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
17 deletions
+22
-17
app/views/admin/system_info/show.html.haml
app/views/admin/system_info/show.html.haml
+17
-17
changelogs/unreleased/dz-redesign-admin-system-info.yml
changelogs/unreleased/dz-redesign-admin-system-info.yml
+5
-0
No files found.
app/views/admin/system_info/show.html.haml
View file @
6c044f12
...
...
@@ -2,34 +2,34 @@
.prepend-top-default
.row
.col-sm
-4
.
card.
bg-light.light-well
.col-sm
.bg-light.light-well
%h4
CPU
.data
-
if
@cpus
%h
1
#{
@cpus
.
length
}
cores
%h
2
#{
@cpus
.
length
}
cores
-
else
=
icon
(
'warning'
,
class:
'text-warning'
)
Unable to collect CPU info
.col-sm-4
.card.bg-light.light-well
.bg-light.light-well.prepend-top-default
%h4
Memory Usage
.data
-
if
@memory
%h
1
#{
number_to_human_size
(
@memory
.
active_bytes
)
}
/
#{
number_to_human_size
(
@memory
.
total_bytes
)
}
%h
2
#{
number_to_human_size
(
@memory
.
active_bytes
)
}
/
#{
number_to_human_size
(
@memory
.
total_bytes
)
}
-
else
=
icon
(
'warning'
,
class:
'text-warning'
)
Unable to collect memory info
.col-sm-4
.card.bg-light.light-well
.bg-light.light-well.prepend-top-default
%h4
Uptime
.data
%h2
=
distance_of_time_in_words_to_now
(
Rails
.
application
.
config
.
booted_at
)
.col-sm
.bg-light.light-well
%h4
Disk Usage
.data
%ul
-
@disks
.
each
do
|
disk
|
%h1
#{
number_to_human_size
(
disk
[
:bytes_used
])
}
/
#{
number_to_human_size
(
disk
[
:bytes_total
])
}
%li
%h2
#{
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
.card.bg-light.light-well
%h4
Uptime
.data
%h1
=
distance_of_time_in_words_to_now
(
Rails
.
application
.
config
.
booted_at
)
changelogs/unreleased/dz-redesign-admin-system-info.yml
0 → 100644
View file @
6c044f12
---
title
:
Improve admin/system_info page ui
merge_request
:
17829
author
:
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment