Create or mark task pending as soon the action happens

5 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 86b8e7bdf2e..be58156a9dc 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -181,6 +181,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       return
     end
 
+    TaskService.new.merge_merge_request(merge_request, current_user)
+
     @merge_request.update(merge_error: nil)
 
     if params[:merge_when_build_succeeds].present? && @merge_request.ci_commit && @merge_request.ci_commit.active?
diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb
index 63c2f1f4249..8f25c5e2496 100644
--- a/app/services/merge_requests/post_merge_service.rb
+++ b/app/services/merge_requests/post_merge_service.rb
@@ -11,7 +11,6 @@ module MergeRequests
       create_merge_event(merge_request, current_user)
       create_note(merge_request)
       notification_service.merge_mr(merge_request, current_user)
-      task_service.merge_merge_request(merge_request, current_user)
       execute_hooks(merge_request, 'merge')
     end
 
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 8d9661167b5..dbbf9e63164 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -8,6 +8,7 @@ module Notes
       if note.save
         # Finish the harder work in the background
         NewNoteWorker.perform_in(2.seconds, note.id, params)
+        TaskService.new.new_note(note, current_user)
       end
 
       note
diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb
index 465b246cabc..e818f58d13c 100644
--- a/app/services/notes/post_process_service.rb
+++ b/app/services/notes/post_process_service.rb
@@ -13,8 +13,6 @@ module Notes
         @note.create_cross_references!
         execute_note_hooks
       end
-
-      TaskService.new.new_note(note)
     end
 
     def hook_data
diff --git a/spec/services/notes/post_process_service_spec.rb b/spec/services/notes/post_process_service_spec.rb
index 9489b8c6336..d4c50f824c1 100644
--- a/spec/services/notes/post_process_service_spec.rb
+++ b/spec/services/notes/post_process_service_spec.rb
@@ -20,7 +20,7 @@ describe Notes::PostProcessService, services: true do
     it do
       expect(project).to receive(:execute_hooks)
       expect(project).to receive(:execute_services)
-      expect_any_instance_of(TaskService).to receive(:new_note).with(@note)
+
       Notes::PostProcessService.new(@note).execute
     end
   end