diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/models/ci/deleted_object.rb | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
| download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/models/ci/deleted_object.rb')
| -rw-r--r-- | app/models/ci/deleted_object.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/deleted_object.rb b/app/models/ci/deleted_object.rb index e74946eda16..2942a153e05 100644 --- a/app/models/ci/deleted_object.rb +++ b/app/models/ci/deleted_object.rb @@ -17,9 +17,9 @@ module Ci .lock('FOR UPDATE SKIP LOCKED') end - def self.bulk_import(artifacts) + def self.bulk_import(artifacts, pick_up_at = nil) attributes = artifacts.each.with_object([]) do |artifact, accumulator| - record = artifact.to_deleted_object_attrs + record = artifact.to_deleted_object_attrs(pick_up_at) accumulator << record if record[:store_dir] && record[:file] end |