Actually don't send resolved notifications when deleting a note

2016-08-03 17:16:37 -07:00 · 2016-08-03 17:16:37 -07:00 · 9b115ce4d3
commit 9b115ce4d3
parent a3a672095d
2 changed files with 2 additions and 4 deletions
--- 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: {
--- 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