diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build.rb | 3 | ||||
| -rw-r--r-- | app/models/ci/job_artifact.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 97960dec08c..3dadb95443a 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -484,7 +484,8 @@ module Ci def erase(opts = {}) return false unless erasable? - erase_erasable_artifacts! + job_artifacts.destroy_all # rubocop: disable DestroyAll + erase_old_artifacts! erase_trace! update_erased!(opts[:erased_by]) end diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index 4965eaa2fbc..7c958598553 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -58,7 +58,7 @@ module Ci end scope :erasable, -> do - types = self.file_types.reject { |file_type| file_types.include?(NON_ERASABLE_FILE_TYPES) }.values + types = self.file_types.reject { |file_type| NON_ERASABLE_FILE_TYPES.include?(file_type) }.values where(file_type: types) end |