diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 21:09:34 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 21:09:34 +0100 |
| commit | 8af23def1d6450420d06b8de54d23311a978de20 (patch) | |
| tree | 5da743be888022a197e2555bbcd12076a9ca3633 /lib/api | |
| parent | 54a575f1bbba44573ab92dc58a4242f1ee734c5d (diff) | |
| download | gitlab-ce-8af23def1d6450420d06b8de54d23311a978de20.tar.gz | |
Revert "Merge branch '3867-port-to-ce' into 'master'"
This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing
changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
Diffstat (limited to 'lib/api')
| -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 1f80646a2ea..80feb629d54 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? - workhorse_upload_path = JobArtifactUploader.workhorse_upload_path - artifacts = uploaded_file(:file, workhorse_upload_path) - metadata = uploaded_file(:metadata, workhorse_upload_path) + artifacts_upload_path = JobArtifactUploader.artifacts_upload_path + artifacts = uploaded_file(:file, artifacts_upload_path) + metadata = uploaded_file(:metadata, artifacts_upload_path) bad_request!('Missing artifacts file!') unless artifacts file_to_large! unless artifacts.size < max_artifacts_size |