diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
| commit | 3366f377c1d4cbb02ecc5a2e47b059ed375c5e09 (patch) | |
| tree | 6a19813b4820ad6d2813bf86b30d8e5be2bd10c6 /lib/api/runner.rb | |
| parent | 0abce36cd20cdd3579138bee835d28519a5593f2 (diff) | |
| parent | cf887a8b3108edb715ee5618377f4ffab1824d85 (diff) | |
| download | gitlab-ce-3366f377c1d4cbb02ecc5a2e47b059ed375c5e09.tar.gz | |
Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
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 50cb1df92ad..5469cba69a6 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -214,9 +214,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 |