diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-03 16:21:59 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-12-03 16:21:59 +0100 |
| commit | 676f48794663e65a7e7290bba19038cd60e6ffa1 (patch) | |
| tree | 0c01d01dad99b2514efa807d80f2e21619c32686 | |
| parent | 6b6fb11a235893335bc8d67b86c9328d027b72e0 (diff) | |
| download | gitlab-ce-676f48794663e65a7e7290bba19038cd60e6ffa1.tar.gz | |
Fix failures
| -rw-r--r-- | app/models/ci/build.rb | 6 | ||||
| -rw-r--r-- | spec/factories/ci/job_artifacts.rb | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index c41757cf394..8738e094510 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -475,11 +475,7 @@ module Ci private def update_artifacts_size - self.artifacts_size = if artifacts_file.exists? - artifacts_file.size - else - nil - end + self.artifacts_size = legacy_artifacts_file&.size end def erase_trace! diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb index cf05472c369..538dc422832 100644 --- a/spec/factories/ci/job_artifacts.rb +++ b/spec/factories/ci/job_artifacts.rb @@ -14,7 +14,7 @@ FactoryGirl.define do after(:build) do |artifact, _| artifact.file = fixture_file_upload( - Rails.root.join('spec/fixtures/ci_build_artifacts.zip'), 'application/zip') + Rails.root.join('spec/fixtures/ci_build_artifacts.zip'), 'application/zip') end end |