From 3327bf6247c9f99d373a31b10edbb3f6c0b868df Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Sun, 22 Apr 2018 10:42:44 -0500 Subject: Removes 'no job log' from trace action 'No job log' message is no longer necessary since we returned an image when a build does not have a trace. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18278 for more details Closes #45625 --- app/controllers/projects/jobs_controller.rb | 2 -- 1 file changed, 2 deletions(-) (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 7497b5012ec..dd12d30a085 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -78,8 +78,6 @@ class Projects::JobsController < Projects::ApplicationController result.merge!(trace.to_h) end - result[:html] = result[:html].presence || 'No job log' - render json: result end end -- cgit v1.2.1