diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-03 12:08:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-03 12:08:53 +0300 |
commit | 1c75400c24137f603678d0ee3d497b0c9280e7f7 (patch) | |
tree | ccf2e8584d8b7efd3c648a276ebe5b456639da3b /app/services/system_note_service.rb | |
parent | 1f23012963babbcc586e7025cc28e62385813fb6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/system_note_service.rb')
-rw-r--r-- | app/services/system_note_service.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 6bf04c55415..41e9d624ec6 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -273,6 +273,26 @@ module SystemNoteService ::SystemNotes::DesignManagementService.new(noteable: design.issue, project: design.project, author: discussion_note.author).design_discussion_added(discussion_note) end + + # Called when the merge request is approved by user + # + # noteable - Noteable object + # user - User performing approve + # + # Example Note text: + # + # "approved this merge request" + # + # Returns the created Note object + def approve_mr(noteable, user) + merge_requests_service(noteable, noteable.project, user).approve_mr + end + + private + + def merge_requests_service(noteable, project, author) + ::SystemNotes::MergeRequestsService.new(noteable: noteable, project: project, author: author) + end end SystemNoteService.prepend_if_ee('EE::SystemNoteService') |