diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-30 08:18:18 -0500 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-30 08:18:20 -0500 |
| commit | 7a7a4356d18c47260522290a4c5a14dff106006a (patch) | |
| tree | d0c6a3f30b39594308d96011d94372925642ef58 | |
| parent | 0bc9e0b4feb746f1b9fe233bfbb6e9afd70e0b98 (diff) | |
| download | gitlab-ce-46552-fixes-redundant-message-for-failure-reasons.tar.gz | |
Moves script_failure conditional over lambda46552-fixes-redundant-message-for-failure-reasons
So the 'failed' message can actually indicate if the build failed or not
| -rw-r--r-- | app/serializers/job_entity.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/job_entity.rb b/app/serializers/job_entity.rb index 30f0bda9418..960e7291ae6 100644 --- a/app/serializers/job_entity.rb +++ b/app/serializers/job_entity.rb @@ -26,7 +26,7 @@ class JobEntity < Grape::Entity expose :created_at expose :updated_at expose :detailed_status, as: :status, with: StatusEntity - expose :callout_message, if: -> (*) { failed? } + expose :callout_message, if: -> (*) { failed? && !build.script_failure? } expose :recoverable, if: -> (*) { failed? } private @@ -54,7 +54,7 @@ class JobEntity < Grape::Entity end def failed? - build.failed? && !build.script_failure? + build.failed? end def callout_message |