Actually don't send resolved notifications when deleting a note

2 files changed, 2 insertions, 4 deletions

diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 027a2d7dcb2..1849311d26d 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -72,6 +72,8 @@ class Projects::NotesController < Projects::ApplicationController
 
     note.resolve!(current_user)
 
+    MergeRequests::AllDiscussionsResolvedService.new(project, current_user).execute(note.noteable)
+
     discussion = note.discussion
 
     render json: {
diff --git a/app/services/notes/delete_service.rb b/app/services/notes/delete_service.rb
index 40d519cdf66..7f1b30ec84e 100644
--- a/app/services/notes/delete_service.rb
+++ b/app/services/notes/delete_service.rb
@@ -3,10 +3,6 @@ module Notes
     def execute(note)
       note.destroy
       note.reset_events_cache
-
-      if note.resolvable?
-        MergeRequests::AllDiscussionsResolvedService.new(project, current_user).execute(note.noteable)
-      end
     end
   end
 end