Also track auto-cancelling in jobs, detail:

Not only tracking auto-cancelling in pipelines,
we'll also track this in jobs because pipelines
could be retried and the information would get lost
when this happened. Also erase auto-cancelling
relation for pipelines when they're retried.

2 files changed, 5 insertions, 3 deletions

diff --git a/app/presenters/ci/build_presenter.rb b/app/presenters/ci/build_presenter.rb
index d9970396cc6..c495c3f39bb 100644
--- a/app/presenters/ci/build_presenter.rb
+++ b/app/presenters/ci/build_presenter.rb
@@ -13,8 +13,8 @@ module Ci
     end
 
     def status_title
-      if canceled? && pipeline.auto_canceled?
-        "Job is redundant and is auto-canceled by Pipeline ##{pipeline.auto_canceled_by_id}"
+      if auto_canceled?
+        "Job is redundant and is auto-canceled by Pipeline ##{auto_canceled_by_id}"
       end
     end
   end
diff --git a/app/presenters/ci/pipeline_presenter.rb b/app/presenters/ci/pipeline_presenter.rb
index b8e74bf5509..a542bdd8295 100644
--- a/app/presenters/ci/pipeline_presenter.rb
+++ b/app/presenters/ci/pipeline_presenter.rb
@@ -3,7 +3,9 @@ module Ci
     presents :pipeline
 
     def status_title
-      "Pipeline is redundant and is auto-canceled by Pipeline ##{auto_canceled_by_id}" if auto_canceled?
+      if auto_canceled?
+        "Pipeline is redundant and is auto-canceled by Pipeline ##{auto_canceled_by_id}"
+      end
     end
   end
 end