Merge branch 'dm-issue-move-transaction-error' into 'master'

Execute project hooks and services after commit when moving an issue

Closes #41324

See merge request gitlab-org/gitlab-ce!16108

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/after_commit_queue.rb b/lib/after_commit_queue.rb
index db63c5038ae..a4d8507960e 100644
--- a/lib/after_commit_queue.rb
+++ b/lib/after_commit_queue.rb
@@ -14,7 +14,15 @@ module AfterCommitQueue
 
   def run_after_commit_or_now(&block)
     if AfterCommitQueue.inside_transaction?
-      run_after_commit(&block)
+      if ActiveRecord::Base.connection.current_transaction.records.include?(self)
+        run_after_commit(&block)
+      else
+        # If the current transaction does not include this record, we can run
+        # the block now, even if it queues a Sidekiq job.
+        Sidekiq::Worker.skipping_transaction_check do
+          instance_eval(&block)
+        end
+      end
     else
       instance_eval(&block)
     end