Commit 3327bf62 authored by Mayra Cabrera's avatar Mayra Cabrera

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
parent 3c3cab8b
......@@ -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
......
---
title: Removes 'No Job log' message from build trace
merge_request: 18523
author:
type: fixed
......@@ -190,10 +190,7 @@ describe Projects::JobsController do
expect(response).to have_gitlab_http_status(:ok)
expect(json_response['id']).to eq job.id
expect(json_response['status']).to eq job.status
end
it 'returns no job log message' do
expect(json_response['html']).to eq('No job log')
expect(json_response['html']).to be_nil
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment