Merge branch 'use-after-transition-ee' into 'master'

Prefer to use after_transition

Closes gitlab-ce#55306

See merge request gitlab-org/gitlab-ee!8839

app/models/ci/build.rb

@@ -221,6 +221,10 @@ module Ci
         next unless build.project
 
         build.deployment&.drop
+      end
+
+      after_transition any => [:failed] do |build|
+        next unless build.project
 
         if build.retry_failure?
           begin

app/models/clusters/applications/ingress.rb

@@ -23,7 +23,7 @@ module Clusters
       FETCH_IP_ADDRESS_DELAY = 30.seconds
 
       state_machine :status do
-        before_transition any => [:installed] do |application|
+        after_transition any => [:installed] do |application|
           application.run_after_commit do
             ClusterWaitForIngressIpAddressWorker.perform_in(
               FETCH_IP_ADDRESS_DELAY, application.name, application.id)

app/models/clusters/applications/knative.rb

@@ -20,7 +20,7 @@ module Clusters
       self.reactive_cache_key = ->(knative) { [knative.class.model_name.singular, knative.id] }
 
       state_machine :status do
-        before_transition any => [:installed] do |application|
+        after_transition any => [:installed] do |application|
           application.run_after_commit do
             ClusterWaitForIngressIpAddressWorker.perform_in(
               FETCH_IP_ADDRESS_DELAY, application.name, application.id)

app/models/merge_request.rb

@@ -107,7 +107,9 @@ class MergeRequest < ActiveRecord::Base
 
     before_transition any => :opened do |merge_request|
       merge_request.merge_jid = nil
+    end
 
+    after_transition any => :opened do |merge_request|
       merge_request.run_after_commit do
         UpdateHeadPipelineForMergeRequestWorker.perform_async(merge_request.id)
       end

ee/app/models/ee/project_import_state.rb

@@ -59,7 +59,9 @@ module EE
             state.reset_retry_count
             state.set_next_execution_timestamp
           end
+        end
 
+        after_transition started: :finished do |state, _|
           if ::Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing?
             state.run_after_commit do
               last_indexed_commit = state.project.index_status&.last_commit