diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-03 14:51:33 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-03 14:51:33 +0400 |
| commit | dcd14c0af0eb191076a4e89785d54273e5521a45 (patch) | |
| tree | b451a8edc5db59714433060ae408baef8e03a58e /app/services/notification_service.rb | |
| parent | 7bff1dc92fa349a1f34183d1b1afeb8053d19aca (diff) | |
| parent | c3533deda1501accee8ba956539553e9af1f7e23 (diff) | |
Merge branch 'no_notification_for_merger' into 'master'
No notification for merger
Fixes #1378
See merge request !935
Diffstat (limited to 'app/services/notification_service.rb')
| -rw-r--r-- | app/services/notification_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index 6c14a2abaf4..423ca18c0b4 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -89,6 +89,7 @@ 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(current_user) recipients.each do |recipient| mailer.merged_merge_request_email(recipient.id, merge_request.id, current_user.id) |