diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-30 18:16:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-30 18:16:56 +0300 |
| commit | fa2fec1d18330e4cd9803ff164db19e7367e3838 (patch) | |
| tree | 91a9bf1c74eeff29690f33e3faf2b8ca87051af3 /app/uploaders/job_artifact_uploader.rb | |
| parent | 8ee0746f54c19fcb8fe81058594aa8d373c5b7d7 (diff) | |
Add latest changes from gitlab-org/security/gitlab@13-5-stable-ee
Diffstat (limited to 'app/uploaders/job_artifact_uploader.rb')
| -rw-r--r-- | app/uploaders/job_artifact_uploader.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb index 47976c909e8..83dc1030606 100644 --- a/app/uploaders/job_artifact_uploader.rb +++ b/app/uploaders/job_artifact_uploader.rb @@ -4,7 +4,6 @@ class JobArtifactUploader < GitlabUploader extend Workhorse::UploadPath include ObjectStorage::Concern - ObjectNotReadyError = Class.new(StandardError) UnknownFileLocationError = Class.new(StandardError) storage_options Gitlab.config.artifacts @@ -24,7 +23,9 @@ class JobArtifactUploader < GitlabUploader private def dynamic_segment - raise ObjectNotReadyError, 'JobArtifact is not ready' unless model.id + # This now tests model.created_at because it can for some reason be nil in the test suite, + # and it's not clear if this is intentional or not + raise ObjectNotReadyError, 'JobArtifact is not ready' unless model.id && model.created_at if model.hashed_path? hashed_path |