Commit bc7656a3 authored by Marin Jankovski's avatar Marin Jankovski

Do not notify person who merged the MR.

parent 119b0287
...@@ -88,8 +88,11 @@ class NotificationService ...@@ -88,8 +88,11 @@ class NotificationService
# #
def merge_mr(merge_request, current_user) def merge_mr(merge_request, current_user)
recipients = reject_muted_users([merge_request.author, merge_request.assignee], merge_request.target_project) recipients = reject_muted_users([merge_request.author, merge_request.assignee], merge_request.target_project)
recipients = recipients.concat(project_watchers(merge_request.target_project)).uniq recipients = recipients.concat(project_watchers(merge_request.target_project)).uniq
recipients.delete(merge_request.merge_event.author) if merge_request.merged?
recipients.each do |recipient| recipients.each do |recipient|
mailer.merged_merge_request_email(recipient.id, merge_request.id, current_user.id) mailer.merged_merge_request_email(recipient.id, merge_request.id, current_user.id)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment