diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 13:59:43 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 20:58:15 +0100 |
| commit | a7dae52e9d27adde427ef8aa066c0761071a3cd9 (patch) | |
| tree | 8b6229e4e0afe7e71f9754089758cee8acd56cde /lib/api/runner.rb | |
| parent | 45d2c31643017807cb3fc66c0be6e9cad9964faf (diff) | |
| download | gitlab-ce-a7dae52e9d27adde427ef8aa066c0761071a3cd9.tar.gz | |
Merge branch '4163-move-uploads-to-object-storage' into 'master'
Move uploads to object storage
Closes #4163
See merge request gitlab-org/gitlab-ee!3867
Diffstat (limited to 'lib/api/runner.rb')
| -rw-r--r-- | lib/api/runner.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 80feb629d54..1f80646a2ea 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -215,9 +215,9 @@ module API job = authenticate_job! forbidden!('Job is not running!') unless job.running? - artifacts_upload_path = JobArtifactUploader.artifacts_upload_path - artifacts = uploaded_file(:file, artifacts_upload_path) - metadata = uploaded_file(:metadata, artifacts_upload_path) + workhorse_upload_path = JobArtifactUploader.workhorse_upload_path + artifacts = uploaded_file(:file, workhorse_upload_path) + metadata = uploaded_file(:metadata, workhorse_upload_path) bad_request!('Missing artifacts file!') unless artifacts file_to_large! unless artifacts.size < max_artifacts_size |