From c3ad57034cc1cbd6d0ad02de7ac57f6004440c83 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 13 Jan 2020 09:08:03 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/jobs_controller.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/controllers/projects/jobs_controller.rb') diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 796f3ff603f..cb473d6ee96 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -51,6 +51,8 @@ class Projects::JobsController < Projects::ApplicationController build.trace.read do |stream| respond_to do |format| format.json do + build.trace.being_watched! + # TODO: when the feature flag is removed we should not pass # content_format to serialize method. content_format = Feature.enabled?(:job_log_json, @project, default_enabled: true) ? :json : :html -- cgit v1.2.3