diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-07-02 16:38:03 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-07-02 16:38:03 +0200 |
| commit | bc7656a306552c3308082ddf4695addac539ec6d (patch) | |
| tree | 10825798abbafc3c54f26d160ff702e40a11cc6c /app | |
| parent | 119b02877dbdd40d45727d2adc0a76579ae829ac (diff) | |
| download | gitlab-ce-bc7656a306552c3308082ddf4695addac539ec6d.tar.gz | |
Do not notify person who merged the MR.
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/notification_service.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index 650b6008db8..4add3fae34b 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -88,8 +88,11 @@ class NotificationService # def merge_mr(merge_request, current_user) 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.delete(merge_request.merge_event.author) if merge_request.merged? + recipients.each do |recipient| mailer.merged_merge_request_email(recipient.id, merge_request.id, current_user.id) end |