Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 21 insertions, 0 deletions

diff --git a/app/uploaders/ci/pipeline_artifact_uploader.rb b/app/uploaders/ci/pipeline_artifact_uploader.rb
new file mode 100644
index 00000000000..d3a83c5d633
--- /dev/null
+++ b/app/uploaders/ci/pipeline_artifact_uploader.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Ci
+  class PipelineArtifactUploader < GitlabUploader
+    include ObjectStorage::Concern
+
+    storage_options Gitlab.config.artifacts
+
+    alias_method :upload, :model
+
+    def store_dir
+      dynamic_segment
+    end
+
+    private
+
+    def dynamic_segment
+      Gitlab::HashedPath.new('pipelines', model.pipeline_id, 'artifacts', model.id, root_hash: model.project_id)
+    end
+  end
+end