summaryrefslogtreecommitdiff
path: root/app/controllers/projects/notes_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-07-28 21:14:41 -0600
committerDouwe Maan <douwe@selenight.nl>2016-07-28 21:14:41 -0600
commit1bee660b96d7a84cfcc4a274c68cbe0fba4b5fa5 (patch)
tree29b8fb3810964091dca9847f957481d991340499 /app/controllers/projects/notes_controller.rb
parentac6b634d9e1afb36c8ebb0d84cd23465fe4b0f84 (diff)
downloadgitlab-ce-1bee660b96d7a84cfcc4a274c68cbe0fba4b5fa5.tar.gz
Don't send resolved notifications when deleting a note
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r--app/controllers/projects/notes_controller.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 1849311d26d..027a2d7dcb2 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -72,8 +72,6 @@ class Projects::NotesController < Projects::ApplicationController
note.resolve!(current_user)
- MergeRequests::AllDiscussionsResolvedService.new(project, current_user).execute(note.noteable)
-
discussion = note.discussion
render json: {