diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-19 07:20:53 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-19 07:20:53 +0000 |
| commit | 93780da67ceebac19033bb0c44483e3af2d38a18 (patch) | |
| tree | 7123498ec227f75c6d00e8dbab111a2fa3a2e64f /app/controllers/projects/jobs_controller.rb | |
| parent | 6ef8b497e721fac49a0914802244f98dd5d99078 (diff) | |
| download | gitlab-ce-93780da67ceebac19033bb0c44483e3af2d38a18.tar.gz | |
Resolve "Show `failure_reason` in jobs view content section"
Diffstat (limited to 'app/controllers/projects/jobs_controller.rb')
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index dd12d30a085..7497b5012ec 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -78,6 +78,8 @@ class Projects::JobsController < Projects::ApplicationController result.merge!(trace.to_h) end + result[:html] = result[:html].presence || 'No job log' + render json: result end end |