Mark pending tasks for the current user as done when he edit a note

2 files changed, 15 insertions, 0 deletions

diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb
index 72e2f78008d..6c2d36546e1 100644
--- a/app/services/notes/update_service.rb
+++ b/app/services/notes/update_service.rb
@@ -7,6 +7,10 @@ module Notes
       note.create_new_cross_references!(current_user)
       note.reset_events_cache
 
+      if note.previous_changes.include?('note')
+        TaskService.new.update_note(note, current_user)
+      end
+
       note
     end
   end
diff --git a/app/services/task_service.rb b/app/services/task_service.rb
index e58974a9b38..57f68c61d00 100644
--- a/app/services/task_service.rb
+++ b/app/services/task_service.rb
@@ -54,6 +54,17 @@ class TaskService
     end
   end
 
+  # When update a note we should:
+  #
+  #  * mark all pending tasks related to the noteable for the current user as done
+  #
+  def update_note(note, current_user)
+    # Skip system notes, like status changes and cross-references
+    unless note.system
+      mark_as_done(note.noteable, current_user)
+    end
+  end
+
   private
 
   def create_task(project, target, author, user, action)