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:
commit
c212908aad
|
@ -78,8 +78,6 @@ class Projects::JobsController < Projects::ApplicationController
|
||||||
result.merge!(trace.to_h)
|
result.merge!(trace.to_h)
|
||||||
end
|
end
|
||||||
|
|
||||||
result[:html] = result[:html].presence || 'No job log'
|
|
||||||
|
|
||||||
render json: result
|
render json: result
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
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(response).to have_gitlab_http_status(:ok)
|
||||||
expect(json_response['id']).to eq job.id
|
expect(json_response['id']).to eq job.id
|
||||||
expect(json_response['status']).to eq job.status
|
expect(json_response['status']).to eq job.status
|
||||||
end
|
expect(json_response['html']).to be_nil
|
||||||
|
|
||||||
it 'returns no job log message' do
|
|
||||||
expect(json_response['html']).to eq('No job log')
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue