diff options
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 934a7961a63..c16fc228f27 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -72,7 +72,7 @@ class Projects::NotesController < Projects::ApplicationController note.resolve!(current_user) - MergeRequests::AllDiscussionsResolvedService.new(project, current_user).execute(note.noteable) + MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(note.noteable) discussion = note.discussion @@ -166,7 +166,7 @@ class Projects::NotesController < Projects::ApplicationController } if note.diff_note? - discussion = note.as_discussion + discussion = note.to_discussion attrs.merge!( diff_discussion_html: diff_discussion_html(discussion), |