Improve transitions and run hooks after transaction

1 files changed, 20 insertions, 18 deletions

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 38554e7a0ca..81f041cf29e 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -85,33 +85,35 @@ class CommitStatus < ActiveRecord::Base
       commit_status.update_attributes finished_at: Time.now
     end
 
+    after_transition do |commit_status|
+      commit_status.run_after_commit do
+        pipeline.try do |pipeline|
+          if complete?
+            ProcessPipelineWorker.perform_async(pipeline.id)
+          else
+            UpdatePipelineWorker.perform_async(pipeline.id)
+          end
+        end
+      end
+    end
+
     after_transition [:created, :pending, :running] => :success do |commit_status|
-      MergeRequests::MergeWhenBuildSucceedsService.new(commit_status.pipeline.project, nil).trigger(commit_status)
+      commit_status.run_after_commit do
+        MergeRequests::MergeWhenBuildSucceedsService
+          .new(pipeline.project, nil).trigger(self)
+      end
     end
 
     after_transition any => :failed do |commit_status|
-      MergeRequests::AddTodoWhenBuildFailsService.new(commit_status.pipeline.project, nil).execute(commit_status)
+      commit_status.run_after_commit do
+        MergeRequests::AddTodoWhenBuildFailsService
+          .new(pipeline.project, nil).execute(self)
+      end
     end
-
-    after_transition do: :schedule_pipeline_update
   end
 
   delegate :sha, :short_sha, to: :pipeline
 
-  def schedule_pipeline_update
-    run_after_commit(:process_pipeline!)
-  end
-
-  def process_pipeline!
-    pipeline.try do |pipeline|
-      if complete?
-        ProcessPipelineWorker.perform_async(pipeline.id)
-      else
-        UpdatePipelineWorker.perform_async(pipeline.id)
-      end
-    end
-  end
-
   def before_sha
     pipeline.before_sha || Gitlab::Git::BLANK_SHA
   end