Commit dcd14c0a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'no_notification_for_merger' into 'master'

No notification for merger

Fixes #1378

See merge request !935
parents 7bff1dc9 c3533ded
...@@ -89,6 +89,7 @@ class NotificationService ...@@ -89,6 +89,7 @@ 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(current_user)
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)
......
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