diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2019-05-02 16:04:15 +0000 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2019-05-02 16:04:15 +0000 |
| commit | d9b383cc3681c4ae6fe0dbef20a3d1089e48e139 (patch) | |
| tree | 8c1a00a07faa120c6fbaacc389fa9266cdf306db /app/views/admin | |
| parent | 37606e666736c9686054ee5155e3d2d21eb1a0c9 (diff) | |
| download | gitlab-ce-d9b383cc3681c4ae6fe0dbef20a3d1089e48e139.tar.gz | |
Add packages_size to ProjectStatistics
This new field will allow to keep track of the storage used by the
packages features, it provides also aggregation at namespace level.
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 10 | ||||
| -rw-r--r-- | app/views/admin/projects/show.html.haml | 9 |
2 files changed, 6 insertions, 13 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 00d255846f9..f524d35d79e 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -44,12 +44,10 @@ %li %span.light= _('Storage:') - - counter_storage = storage_counter(@group.storage_size) - - counter_repositories = storage_counter(@group.repository_size) - - counter_build_artifacts = storage_counter(@group.build_artifacts_size) - - counter_lfs_objects = storage_counter(@group.lfs_objects_size) - %strong - = _("%{counter_storage} (%{counter_repositories} repositories, %{counter_build_artifacts} build artifacts, %{counter_lfs_objects} LFS)") % { counter_storage: counter_storage, counter_repositories: counter_repositories, counter_build_artifacts: counter_build_artifacts, counter_lfs_objects: counter_lfs_objects } + %strong= storage_counter(@group.storage_size) + ( + = storage_counters_details(@group) + ) %li %span.light= _('Group Git LFS status:') diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 03cce4745aa..bc34af88928 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -73,15 +73,10 @@ = @project.repository.relative_path %li - %span.light Storage used: + %span.light= _('Storage:') %strong= storage_counter(@project.statistics.storage_size) ( - = storage_counter(@project.statistics.repository_size) - repository, - = storage_counter(@project.statistics.build_artifacts_size) - build artifacts, - = storage_counter(@project.statistics.lfs_objects_size) - LFS + = storage_counters_details(@project.statistics) ) %li |