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 /app/controllers/projects/jobs_controller.rb | |
| 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
Diffstat (limited to 'app/controllers/projects/jobs_controller.rb')
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 |
1 files changed, 0 insertions, 2 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 |