From ca09e3fce7d739b41ab0e45d05a878be0e0b8356 Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Thu, 2 May 2019 18:37:38 +0000 Subject: Revert "Merge branch 'ac-package-storage-stats' into 'master'" This reverts merge request !27373 --- app/models/project_statistics.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'app/models/project_statistics.rb') diff --git a/app/models/project_statistics.rb b/app/models/project_statistics.rb index 6fe8cb40d25..c020e72908c 100644 --- a/app/models/project_statistics.rb +++ b/app/models/project_statistics.rb @@ -7,7 +7,7 @@ class ProjectStatistics < ApplicationRecord before_save :update_storage_size COLUMNS_TO_REFRESH = [:repository_size, :lfs_objects_size, :commit_count].freeze - INCREMENTABLE_COLUMNS = { build_artifacts_size: %i[storage_size], packages_size: %i[storage_size] }.freeze + INCREMENTABLE_COLUMNS = { build_artifacts_size: %i[storage_size] }.freeze def total_repository_size repository_size + lfs_objects_size @@ -36,13 +36,8 @@ class ProjectStatistics < ApplicationRecord self.lfs_objects_size = project.lfs_objects.sum(:size) end - # older migrations fail due to non-existent attribute without this - def packages_size - has_attribute?(:packages_size) ? super.to_i : 0 - end - def update_storage_size - self.storage_size = repository_size + lfs_objects_size + build_artifacts_size + packages_size + self.storage_size = repository_size + lfs_objects_size + build_artifacts_size end # Since this incremental update method does not call update_storage_size above, -- cgit v1.2.1