Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-04-05 18:33:19 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-04-05 18:33:19 +0300
commit34eea29511b9730fdab0316573d26d864d0f1e98 (patch)
tree2a0fc57d9bdc7ad276b120bcb0c57c44d28e3894 /app/presenters
parent2d4fd769a7a53f6f8ac1cd0331a8eb6b625dc8b6 (diff)
Fix test and only show job status title if it's
cancelled and the pipeline is auto-cancelled.
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/ci/build_presenter.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/presenters/ci/build_presenter.rb b/app/presenters/ci/build_presenter.rb
index ed72ed14d72..d9970396cc6 100644
--- a/app/presenters/ci/build_presenter.rb
+++ b/app/presenters/ci/build_presenter.rb
@@ -11,5 +11,11 @@ module Ci
def erased_by_name
erased_by.name if erased_by_user?
end
+
+ def status_title
+ if canceled? && pipeline.auto_canceled?
+ "Job is redundant and is auto-canceled by Pipeline ##{pipeline.auto_canceled_by_id}"
+ end
+ end
end
end