diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-22 10:42:44 -0500 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-22 10:55:17 -0500 |
| commit | 3327bf6247c9f99d373a31b10edbb3f6c0b868df (patch) | |
| tree | b4fb19e816400670357c59f4fab55bfb41af5658 | |
| parent | 3c3cab8b329ce83ae7d1c669a6933dcb16fcd552 (diff) | |
| download | gitlab-ce-3327bf6247c9f99d373a31b10edbb3f6c0b868df.tar.gz | |
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
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/45625-job-log-shows-no-job-log.yml | 5 | ||||
| -rw-r--r-- | spec/controllers/projects/jobs_controller_spec.rb | 5 |
3 files changed, 6 insertions, 6 deletions
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 diff --git a/changelogs/unreleased/45625-job-log-shows-no-job-log.yml b/changelogs/unreleased/45625-job-log-shows-no-job-log.yml new file mode 100644 index 00000000000..5f60e818cc1 --- /dev/null +++ b/changelogs/unreleased/45625-job-log-shows-no-job-log.yml @@ -0,0 +1,5 @@ +--- +title: Removes 'No Job log' message from build trace +merge_request: 18523 +author: +type: fixed diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb index f677cec3408..b9a979044fe 100644 --- a/spec/controllers/projects/jobs_controller_spec.rb +++ b/spec/controllers/projects/jobs_controller_spec.rb @@ -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 |