diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-15 12:37:02 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-15 12:37:02 +0000 |
| commit | 3a19e532f51b4b52ec3e292921106f43f8db948e (patch) | |
| tree | 5a27e70dda4a8a0454810356e521f2815e8104d0 | |
| parent | d835bbf19a088ff8178d716c9918408912631969 (diff) | |
| parent | dd4b6db23ef0fa67cb98a695692b4e42136ed8a9 (diff) | |
| download | gitlab-ce-3a19e532f51b4b52ec3e292921106f43f8db948e.tar.gz | |
Merge branch '38145_ux_issues_in_system_info_page' into 'master'
Fix UX issues in system info page
Closes #38145
See merge request gitlab-org/gitlab-ce!15802
| -rw-r--r-- | app/views/admin/system_info/show.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/38145_ux_issues_in_system_info_page.yml | 5 | ||||
| -rw-r--r-- | spec/features/admin/admin_system_info_spec.rb | 12 |
3 files changed, 14 insertions, 9 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) diff --git a/changelogs/unreleased/38145_ux_issues_in_system_info_page.yml b/changelogs/unreleased/38145_ux_issues_in_system_info_page.yml new file mode 100644 index 00000000000..d2358750518 --- /dev/null +++ b/changelogs/unreleased/38145_ux_issues_in_system_info_page.yml @@ -0,0 +1,5 @@ +--- +title: Fixes the wording of headers in system info page +merge_request: 15802 +author: Gilbert Roulot +type: fixed diff --git a/spec/features/admin/admin_system_info_spec.rb b/spec/features/admin/admin_system_info_spec.rb index 1fd1cda694a..5a989319d5b 100644 --- a/spec/features/admin/admin_system_info_spec.rb +++ b/spec/features/admin/admin_system_info_spec.rb @@ -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 'Disks' + 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 'Disks' + 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 'Disks' + expect(page).to have_content 'Memory Usage Unable to collect memory info' + expect(page).to have_content 'Disk Usage' expect(page).to have_content 'Uptime' end end |