diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-01-17 14:25:14 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-01-17 14:25:14 +0000 |
| commit | 8547b5460708ad7e5b159e442c6c4c5ee1c2d8ac (patch) | |
| tree | 1743e73bb2e564274d2970edf5c1ae8a68e5b837 | |
| parent | 59ac14aa6c4f8b290975fc2313caf73fc9461ea1 (diff) | |
| parent | d6b4b33c0d63273c193b7ea4102dede3b24fa1e7 (diff) | |
| download | gitlab-ce-8547b5460708ad7e5b159e442c6c4c5ee1c2d8ac.tar.gz | |
Merge branch '56363-inconsitent-file-size-indication-across-different-ci-pages' into 'master'
Show CI artifacts size with 3 significant digits
Closes #56363
See merge request gitlab-org/gitlab-ce!24387
3 files changed, 9 insertions, 3 deletions
diff --git a/app/views/projects/artifacts/_tree_file.html.haml b/app/views/projects/artifacts/_tree_file.html.haml index cfb91568061..f42d5128715 100644 --- a/app/views/projects/artifacts/_tree_file.html.haml +++ b/app/views/projects/artifacts/_tree_file.html.haml @@ -14,4 +14,4 @@ = link_to path_to_file, class: 'str-truncated' do %span= blob.name %td - = number_to_human_size(blob.size, precision: 2) + = number_to_human_size(blob.size) diff --git a/changelogs/unreleased/56363-inconsitent-file-size-indication-across-different-ci-pages.yml b/changelogs/unreleased/56363-inconsitent-file-size-indication-across-different-ci-pages.yml new file mode 100644 index 00000000000..7c923422534 --- /dev/null +++ b/changelogs/unreleased/56363-inconsitent-file-size-indication-across-different-ci-pages.yml @@ -0,0 +1,6 @@ +--- +title: Show CI artifact file size with 3 significant digits on 'browse job artifacts' + page +merge_request: 24387 +author: +type: fixed diff --git a/spec/features/projects/artifacts/user_browses_artifacts_spec.rb b/spec/features/projects/artifacts/user_browses_artifacts_spec.rb index 9ebbbaea911..5f630c9ffa4 100644 --- a/spec/features/projects/artifacts/user_browses_artifacts_spec.rb +++ b/spec/features/projects/artifacts/user_browses_artifacts_spec.rb @@ -25,8 +25,8 @@ describe "User browses artifacts" do page.within(".tree-table") do expect(page).to have_no_content("..") .and have_content("other_artifacts_0.1.2") - .and have_content("ci_artifacts.txt") - .and have_content("rails_sample.jpg") + .and have_content("ci_artifacts.txt 27 Bytes") + .and have_content("rails_sample.jpg 34.4 KB") end page.within(".build-header") do |