Automatic merge of gitlab-org/gitlab-ce master

app/helpers/storage_helper.rb

@@ -17,6 +17,6 @@ module StorageHelper
       counter_lfs_objects: storage_counter(statistics.lfs_objects_size)
     }
 
-    _("%{counter_repositories} repositories, %{counter_wikis} wikis, %{counter_build_artifacts} build artifacts, %{counter_lfs_objects} LFS") % counters
+    _("Repository: %{counter_repositories} / Wikis: %{counter_wikis} / Build Artifacts: %{counter_build_artifacts} / LFS: %{counter_lfs_objects}") % counters
   end
 end

app/views/admin/groups/show.html.haml

@@ -43,11 +43,7 @@
         = render_if_exists 'admin/namespace_plan_info', namespace: @group
 
         %li
-          %span.light= _('Storage:')
-          %strong= storage_counter(@group.storage_size)
-          (
-          = storage_counters_details(@group)
-          )
+          = render 'shared/storage_counter_statistics', storage_size: @group.storage_size, storage_details: @group
 
         %li
           %span.light= _('Group Git LFS status:')

app/views/admin/projects/show.html.haml

@@ -73,11 +73,7 @@
               = @project.repository.relative_path
 
           %li
-            %span.light= _('Storage:')
-            %strong= storage_counter(@project.statistics&.storage_size)
-            - if @project.statistics
-              = surround '(', ')' do
-                = storage_counters_details(@project.statistics)
+            = render 'shared/storage_counter_statistics', storage_size: @project.statistics&.storage_size, storage_details: @project.statistics
 
           %li
             %span.light last commit:

app/views/shared/_storage_counter_statistics.html.haml

+%span.light= _('Storage:')
+%strong= storage_counter(storage_size)
+- if storage_details
+  (#{storage_counters_details(storage_details)})

changelogs/unreleased/61284-frontend-follow-up-from-add-packages_size-to-projectstatistics.yml

+---
+title: Improved readability of storage statistics in group / project admin area
+merge_request: 30406
+author:
+type: other

doc/administration/audit_events.md

@@ -99,7 +99,7 @@ It is possible to filter particular actions by choosing an audit data type from
 the filter drop-down. You can further filter by specific group, project or user
 (for authentication events).
 
-![audit log](audit_log.png)
+![audit log](img/audit_log.png)
 
 ### Missing events
 

doc/administration/auditor_users.md

@@ -52,7 +52,7 @@ section.
    **Admin Area > Users**. You will find the option of the access level under
    the 'Access' section.
 
-    ![Admin Area Form](auditor_access_form.png)
+    ![Admin Area Form](img/auditor_access_form.png)
 
 1. Click **Save changes** or **Create user** for the changes to take effect.
 

spec/features/admin/admin_sees_project_statistics_spec.rb

@@ -15,7 +15,7 @@ describe "Admin > Admin sees project statistics" do
     let(:project) { create(:project, :repository) }
 
     it "shows project statistics" do
-      expect(page).to have_content("Storage: 0 Bytes (0 Bytes repositories, 0 Bytes wikis, 0 Bytes build artifacts, 0 Bytes LFS)")
+      expect(page).to have_content("Storage: 0 Bytes (Repository: 0 Bytes / Wikis: 0 Bytes / Build Artifacts: 0 Bytes / LFS: 0 Bytes)")
     end
   end
 

spec/helpers/storage_helper_spec.rb

@@ -31,7 +31,7 @@ describe StorageHelper do
                                build_artifacts_size: 30.megabytes))
     end
 
-    let(:message) { '10 KB repositories, 10 Bytes wikis, 30 MB build artifacts, 20 GB LFS' }
+    let(:message) { 'Repository: 10 KB / Wikis: 10 Bytes / Build Artifacts: 30 MB / LFS: 20 GB' }
 
     it 'works on ProjectStatistics' do
       expect(helper.storage_counters_details(project.statistics)).to eq(message)