diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-18 23:13:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-18 23:13:44 +0000 |
| commit | 584fc5c5a7a5cbf36110135599c3d7a1e92bad5a (patch) | |
| tree | f46817afcc514c15aae7b8f631c7a6b2f1c2188d | |
| parent | 676d558a37ad59d042fc3640c66c452944884851 (diff) | |
| parent | 22aef3d424187b2178698af7d4f2dda1aef43cb8 (diff) | |
| download | gitlab-ce-584fc5c5a7a5cbf36110135599c3d7a1e92bad5a.tar.gz | |
Merge branch '42154-fix-artifact-size-calc' into 'master'
Resolve "Bug calculating artifacts size for project statistics"
Closes #42154
See merge request gitlab-org/gitlab-ce!16539
| -rw-r--r-- | app/models/project_statistics.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/42154-fix-artifact-size-calc.yml | 5 | ||||
| -rw-r--r-- | spec/models/project_statistics_spec.rb | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/models/project_statistics.rb b/app/models/project_statistics.rb index 17b9d2cf7b4..87a4350f022 100644 --- a/app/models/project_statistics.rb +++ b/app/models/project_statistics.rb @@ -37,7 +37,7 @@ class ProjectStatistics < ActiveRecord::Base def update_build_artifacts_size self.build_artifacts_size = project.builds.sum(:artifacts_size) + - Ci::JobArtifact.artifacts_size_for(self) + Ci::JobArtifact.artifacts_size_for(self.project) end def update_storage_size diff --git a/changelogs/unreleased/42154-fix-artifact-size-calc.yml b/changelogs/unreleased/42154-fix-artifact-size-calc.yml new file mode 100644 index 00000000000..3d6911abf09 --- /dev/null +++ b/changelogs/unreleased/42154-fix-artifact-size-calc.yml @@ -0,0 +1,5 @@ +--- +title: Fix a bug calculating artifact size for project statistics +merge_request: 16539 +author: +type: fixed diff --git a/spec/models/project_statistics_spec.rb b/spec/models/project_statistics_spec.rb index e78ed1df821..5cff2af4aca 100644 --- a/spec/models/project_statistics_spec.rb +++ b/spec/models/project_statistics_spec.rb @@ -146,6 +146,12 @@ describe ProjectStatistics do expect(statistics.build_artifacts_size).to be(106365) end + + it 'calculates related build artifacts by project' do + expect(Ci::JobArtifact).to receive(:artifacts_size_for).with(project) { 0 } + + statistics.update_build_artifacts_size + end end context 'when legacy artifacts are used' do |