diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-10-09 09:14:35 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-10-10 10:59:02 -0700 |
| commit | 2df573dac3859034fcb90566a8ebc270a7e6088a (patch) | |
| tree | d3d344939b9cf8c50908ac87f1bdce3b7a1d316b /lib/api | |
| parent | c99e9edce7fa71ad53cb35e3bac2afe4646d1ebd (diff) | |
| download | gitlab-ce-2df573dac3859034fcb90566a8ebc270a7e6088a.tar.gz | |
Fix bug where merge request comments created by API would not trigger notifications
Closes https://github.com/gitlabhq/gitlabhq/issues/9715
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/merge_requests.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 63ea2f05438..8cfc8ee6713 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -249,8 +249,16 @@ module API required_attributes! [:note] merge_request = user_project.merge_requests.find(params[:merge_request_id]) - note = merge_request.notes.new(note: params[:note], project_id: user_project.id) - note.author = current_user + + authorize! :create_note, merge_request + + opts = { + note: params[:note], + noteable_type: 'MergeRequest', + noteable_id: merge_request.id + } + + note = ::Notes::CreateService.new(user_project, current_user, opts).execute if note.save present note, with: Entities::MRNote |