From fa4a613517a4a236ea5e98a1964e52c8b4eef595 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 28 Jul 2016 20:39:35 -0600 Subject: Add 'Resolved all discussions' system note --- app/controllers/projects/discussions_controller.rb | 2 ++ app/controllers/projects/notes_controller.rb | 2 ++ 2 files changed, 4 insertions(+) (limited to 'app/controllers') diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb index 11c8f714a95..86e3f865c6f 100644 --- a/app/controllers/projects/discussions_controller.rb +++ b/app/controllers/projects/discussions_controller.rb @@ -9,6 +9,8 @@ class Projects::DiscussionsController < Projects::ApplicationController discussion.resolve!(current_user) + MergeRequests::AllDiscussionsResolvedService.new(project, current_user).execute(merge_request) + render json: { resolved_by: discussion.resolved_by.try(:name), discussion_headline_html: view_to_html_string('discussions/_headline', discussion: discussion) 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: { -- cgit v1.2.1