summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-01-25 23:04:53 +0900
committerShinya Maeda <shinya@gitlab.com>2018-02-06 15:50:07 +0900
commit14d1715610b7df7f8f518a8b57ee4176f208c4a8 (patch)
tree252e33ffbb803da8e5fddf26399c7ccc95776c64
parent8a89efd87a137634381a93c45c05e587eb207b94 (diff)
downloadgitlab-ce-14d1715610b7df7f8f518a8b57ee4176f208c4a8.tar.gz
Inlcude the size of trace artifacts
-rw-r--r--app/models/concerns/artifact_migratable.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/concerns/artifact_migratable.rb b/app/models/concerns/artifact_migratable.rb
index 0460439e9e6..ff52ca64459 100644
--- a/app/models/concerns/artifact_migratable.rb
+++ b/app/models/concerns/artifact_migratable.rb
@@ -39,7 +39,6 @@ module ArtifactMigratable
end
def artifacts_size
- read_attribute(:artifacts_size).to_i +
- job_artifacts_archive&.size.to_i + job_artifacts_metadata&.size.to_i
+ read_attribute(:artifacts_size).to_i + job_artifacts.sum(:size).to_i
end
end