diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-05-01 15:39:44 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-01 15:39:44 +0300 |
| commit | 7a76caa5a8d2c6be9aa4b698a8919e223df973d3 (patch) | |
| tree | 0f9240de123b0570be2a5aec9566d0dcf7a65627 /app/controllers/projects/notes_controller.rb | |
| parent | 3fcb9c115d776feba3f71fb58359a3935edfda9b (diff) | |
Merge request and commit discussions API
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 86c50d88a2a..bc13b8ad7ba 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -33,9 +33,7 @@ class Projects::NotesController < Projects::ApplicationController def resolve return render_404 unless note.resolvable? - note.resolve!(current_user) - - MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(note.noteable) + Notes::ResolveService.new(project, current_user).execute(note) discussion = note.discussion |