Use before_transition

1 files changed, 4 insertions, 4 deletions

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 23c6ad819c4..9165565d8fd 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -70,6 +70,10 @@ module Ci
         pipeline.update_duration
       end
 
+      before_transition :canceled => any - [:canceled] do |pipeline|
+        pipeline.auto_canceled_by = nil
+      end
+
       after_transition [:created, :pending] => :running do |pipeline|
         pipeline.run_after_commit { PipelineMetricsWorker.perform_async(id) }
       end
@@ -95,10 +99,6 @@ module Ci
           PipelineNotificationWorker.perform_async(pipeline.id)
         end
       end
-
-      after_transition :canceled => any - [:canceled] do |pipeline|
-        pipeline.auto_canceled_by = nil
-      end
     end
 
     # ref can't be HEAD or SHA, can only be branch/tag name