Mark pending tasks for the note author as done when he left a note

2 files changed, 13 insertions, 2 deletions

diff --git a/app/services/notes/post_process_service.rb b/app/services/notes/post_process_service.rb
index f37d3c50cdd..465b246cabc 100644
--- a/app/services/notes/post_process_service.rb
+++ b/app/services/notes/post_process_service.rb
@@ -1,6 +1,5 @@
 module Notes
   class PostProcessService
-
     attr_accessor :note
 
     def initialize(note)
@@ -14,6 +13,8 @@ module Notes
         @note.create_cross_references!
         execute_note_hooks
       end
+
+      TaskService.new.new_note(note)
     end
 
     def hook_data
@@ -25,6 +26,5 @@ module Notes
       @note.project.execute_hooks(note_data, :note_hooks)
       @note.project.execute_services(note_data, :note_hooks)
     end
-
   end
 end
diff --git a/app/services/task_service.rb b/app/services/task_service.rb
index 0d66f89e997..e58974a9b38 100644
--- a/app/services/task_service.rb
+++ b/app/services/task_service.rb
@@ -43,6 +43,17 @@ class TaskService
     pending_tasks.update_all(state: :done)
   end
 
+  # When create a note we should:
+  #
+  #  * mark all pending tasks related to the noteable for the note author as done
+  #
+  def new_note(note)
+    # Skip system notes, like status changes and cross-references
+    unless note.system
+      mark_as_done(note.noteable, note.author)
+    end
+  end
+
   private
 
   def create_task(project, target, author, user, action)