diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 12:08:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 12:08:03 +0300 |
| commit | c3ad57034cc1cbd6d0ad02de7ac57f6004440c83 (patch) | |
| tree | b27a4424d2d5d930ffdaf1ef872851ce691d4e7a /app/controllers/projects/jobs_controller.rb | |
| parent | 6ede90f5dd63d4a1f5ba243b4ed5097bb1a0acab (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/jobs_controller.rb')
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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 |