summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-05-02 18:37:38 +0000
committerWinnie Hellmann <winnie@gitlab.com>2019-05-02 18:37:38 +0000
commitca09e3fce7d739b41ab0e45d05a878be0e0b8356 (patch)
tree64fc578138377b1d6111b2ae91a0f522b756a5aa /app/models
parentacaef5e35b9519b5e4ebcefee274e8c8f3d8c85a (diff)
downloadgitlab-ce-revert-f1526ccd.tar.gz
Revert "Merge branch 'ac-package-storage-stats' into 'master'"revert-f1526ccd
This reverts merge request !27373
Diffstat (limited to 'app/models')
-rw-r--r--app/models/namespace.rb3
-rw-r--r--app/models/project_statistics.rb9
2 files changed, 3 insertions, 9 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 7393ef4b05c..168f6bedd63 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -77,8 +77,7 @@ class Namespace < ApplicationRecord
'COALESCE(SUM(ps.storage_size), 0) AS storage_size',
'COALESCE(SUM(ps.repository_size), 0) AS repository_size',
'COALESCE(SUM(ps.lfs_objects_size), 0) AS lfs_objects_size',
- 'COALESCE(SUM(ps.build_artifacts_size), 0) AS build_artifacts_size',
- 'COALESCE(SUM(ps.packages_size), 0) AS packages_size'
+ 'COALESCE(SUM(ps.build_artifacts_size), 0) AS build_artifacts_size'
)
end
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,