Commit 9b115ce4 authored by Douwe Maan's avatar Douwe Maan

Actually don't send resolved notifications when deleting a note

parent a3a67209
...@@ -72,6 +72,8 @@ class Projects::NotesController < Projects::ApplicationController ...@@ -72,6 +72,8 @@ class Projects::NotesController < Projects::ApplicationController
note.resolve!(current_user) note.resolve!(current_user)
MergeRequests::AllDiscussionsResolvedService.new(project, current_user).execute(note.noteable)
discussion = note.discussion discussion = note.discussion
render json: { render json: {
......
...@@ -3,10 +3,6 @@ module Notes ...@@ -3,10 +3,6 @@ module Notes
def execute(note) def execute(note)
note.destroy note.destroy
note.reset_events_cache note.reset_events_cache
if note.resolvable?
MergeRequests::AllDiscussionsResolvedService.new(project, current_user).execute(note.noteable)
end
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment