diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-03 17:16:37 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-04 13:44:28 -0700 |
| commit | 9b115ce4d3ccdd03043f070935d3a25e96f537f4 (patch) | |
| tree | ed44a34ad65b2f128895b8c82801378809d5d01a /app/controllers/projects/notes_controller.rb | |
| parent | a3a672095d00e98499153d4dc598f4e1210d65f2 (diff) | |
| download | gitlab-ce-9b115ce4d3ccdd03043f070935d3a25e96f537f4.tar.gz | |
Actually 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.rb | 2 |
1 files changed, 2 insertions, 0 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: { |