Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-07-29 05:39:35 +0300
committerDouwe Maan <douwe@selenight.nl>2016-07-29 05:39:35 +0300
commitfa4a613517a4a236ea5e98a1964e52c8b4eef595 (patch)
tree5142b38d7dabc9096818dae7b15c45719de98efb /app/controllers/projects/notes_controller.rb
parent220b82a40c2af56712602c4f9c37163b84c92cac (diff)
Add 'Resolved all discussions' system note
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r--app/controllers/projects/notes_controller.rb2
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: {