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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
dd4b6db2
Commit
dd4b6db2
authored
7 years ago
by
Gilbert Roulot
Committed by
Sean McGivern
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UX issues in system info page
parent
d835bbf1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
9 deletions
+14
-9
app/views/admin/system_info/show.html.haml
app/views/admin/system_info/show.html.haml
+3
-3
changelogs/unreleased/38145_ux_issues_in_system_info_page.yml
...gelogs/unreleased/38145_ux_issues_in_system_info_page.yml
+5
-0
spec/features/admin/admin_system_info_spec.rb
spec/features/admin/admin_system_info_spec.rb
+6
-6
No files found.
app/views/admin/system_info/show.html.haml
View file @
dd4b6db2
...
...
@@ -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
Disk
s
%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
)
This diff is collapsed.
Click to expand it.
changelogs/unreleased/38145_ux_issues_in_system_info_page.yml
0 → 100644
View file @
dd4b6db2
---
title
:
Fixes the wording of headers in system info page
merge_request
:
15802
author
:
Gilbert Roulot
type
:
fixed
This diff is collapsed.
Click to expand it.
spec/features/admin/admin_system_info_spec.rb
View file @
dd4b6db2
...
...
@@ -18,8 +18,8 @@ describe 'Admin System Info' do
it
'shows system info page'
do
expect
(
page
).
to
have_content
'CPU 2 cores'
expect
(
page
).
to
have_content
'Memory 4 GB / 16 GB'
expect
(
page
).
to
have_content
'Disk
s
'
expect
(
page
).
to
have_content
'Memory
Usage
4 GB / 16 GB'
expect
(
page
).
to
have_content
'Disk
Usage
'
expect
(
page
).
to
have_content
'Uptime'
end
end
...
...
@@ -33,8 +33,8 @@ describe 'Admin System Info' do
it
'shows system info page with no CPU info'
do
expect
(
page
).
to
have_content
'CPU Unable to collect CPU info'
expect
(
page
).
to
have_content
'Memory 4 GB / 16 GB'
expect
(
page
).
to
have_content
'Disk
s
'
expect
(
page
).
to
have_content
'Memory
Usage
4 GB / 16 GB'
expect
(
page
).
to
have_content
'Disk
Usage
'
expect
(
page
).
to
have_content
'Uptime'
end
end
...
...
@@ -48,8 +48,8 @@ describe 'Admin System Info' do
it
'shows system info page with no CPU info'
do
expect
(
page
).
to
have_content
'CPU 2 cores'
expect
(
page
).
to
have_content
'Memory Unable to collect memory info'
expect
(
page
).
to
have_content
'Disk
s
'
expect
(
page
).
to
have_content
'Memory U
sage U
nable to collect memory info'
expect
(
page
).
to
have_content
'Disk
Usage
'
expect
(
page
).
to
have_content
'Uptime'
end
end
...
...
This diff is collapsed.
Click to expand it.
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