summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2017-09-19 09:14:06 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-12-03 12:04:47 +0100
commit25df666156279e5b392b429519b4f4ba01eefaac (patch)
tree6c1283d937cebb3ee4542e5d7bfc974939eff657 /app/uploaders
parent8ac7f29726989bc0a20ee32780aa18625159f8b4 (diff)
downloadgitlab-ce-25df666156279e5b392b429519b4f4ba01eefaac.tar.gz
Create Ci::Artifacts
To allow jobs/builds to have multiple artifacts, and to start seperating concerns from Ci::Build a new model is created: Ci::Artifact. Changes include the updating of the ArtifactUploader to adapt to a slightly different interface. The uploader expects to be initialized with a `Ci::Build`. Futher a migration with the minimal fields, the needed foreign keys and an index. Last, the way this works is by prepending a module to Ci::Build so we can basically override behaviour but if needed use `super` to get the original behaviour.
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/artifact_uploader.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/uploaders/artifact_uploader.rb b/app/uploaders/artifact_uploader.rb
index 14addb6cf14..8ac0e2fe5a2 100644
--- a/app/uploaders/artifact_uploader.rb
+++ b/app/uploaders/artifact_uploader.rb
@@ -12,6 +12,10 @@ class ArtifactUploader < GitlabUploader
end
def initialize(job, field)
+ # Temporairy conditional, needed to move artifacts to their own table,
+ # but keeping compat with Ci::Build for the time being
+ job = job.build if job.respond_to?(:build)
+
@job, @field = job, field
end