Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 4 deletions

diff --git a/app/services/issuable/destroy_service.rb b/app/services/issuable/destroy_service.rb
index b75905fb5b0..6aab56f0f68 100644
--- a/app/services/issuable/destroy_service.rb
+++ b/app/services/issuable/destroy_service.rb
@@ -26,13 +26,15 @@ module Issuable
     end
 
     def delete_todos(actor, issuable)
-      TodosDestroyer::DestroyedIssuableWorker
-        .perform_async(issuable.id, issuable.class.name)
+      issuable.run_after_commit_or_now do
+        TodosDestroyer::DestroyedIssuableWorker.perform_async(issuable.id, issuable.class.name)
+      end
     end
 
     def delete_label_links(actor, issuable)
-      Issuable::LabelLinksDestroyWorker
-        .perform_async(issuable.id, issuable.class.name)
+      issuable.run_after_commit_or_now do
+        Issuable::LabelLinksDestroyWorker.perform_async(issuable.id, issuable.class.name)
+      end
     end
   end
 end