summaryrefslogtreecommitdiff
path: root/lib/api/runner.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 14:21:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 14:21:10 +0000
commitcb0d23c455b73486fd1015f8ca9479b5b7e3585d (patch)
treed7dc129a407fd74266d2dc561bebf24665197c2f /lib/api/runner.rb
parentc3e911be175c0aabfea1eb030f9e0ef23f5f3887 (diff)
downloadgitlab-ce-cb0d23c455b73486fd1015f8ca9479b5b7e3585d.tar.gz
Add latest changes from gitlab-org/gitlab@12-7-stable-ee
Diffstat (limited to 'lib/api/runner.rb')
-rw-r--r--lib/api/runner.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index f383c541f8a..60cf9bf2c9c 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -200,6 +200,10 @@ module API
status 202
header 'Job-Status', job.status
header 'Range', "0-#{stream_size}"
+
+ if Feature.enabled?(:runner_job_trace_update_interval_header, default_enabled: true)
+ header 'X-GitLab-Trace-Update-Interval', job.trace.update_interval.to_s
+ end
end
desc 'Authorize artifacts uploading for job' do