Merge branch '45625-job-log-shows-no-job-log' into 'master'

Removes  'Job log message' from build trace

Closes #45625

See merge request gitlab-org/gitlab-ce!18523
This commit is contained in:
Grzegorz Bizon 2018-04-22 17:54:02 +00:00
commit c212908aad
3 changed files with 6 additions and 6 deletions

View File

@ -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

View File

@ -0,0 +1,5 @@
---
title: Removes 'No Job log' message from build trace
merge_request: 18523
author:
type: fixed

View File

@ -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