summaryrefslogtreecommitdiff
path: root/lib/api/runner.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-01 12:08:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-01 12:08:00 +0000
commit1a0d6dbdc2ac3047f4953a359ef27ba6e26074ae (patch)
treeddb78a8a0d1350dc767f049a21e0f7d37edaa82c /lib/api/runner.rb
parentb11f7057d067885619ee3e513751f180b2e8ad85 (diff)
downloadgitlab-ce-1a0d6dbdc2ac3047f4953a359ef27ba6e26074ae.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/runner.rb')
-rw-r--r--lib/api/runner.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index 0b6bad6708b..f97e28de628 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -207,10 +207,7 @@ 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
+ header 'X-GitLab-Trace-Update-Interval', job.trace.update_interval.to_s
end
desc 'Authorize artifacts uploading for job' do