Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-07-03 12:26:47 +0400
committerMarin Jankovski <marin@gitlab.com>2014-07-03 12:26:47 +0400
commitc3533deda1501accee8ba956539553e9af1f7e23 (patch)
treeefd77ca808d0f71de0deb108a74b133e72839779 /app/services
parentf50c7ecadcea18575df8a18526b0a78c5b0e1d87 (diff)
Don't notify the user that triggered the mr notification.
Diffstat (limited to 'app/services')
-rw-r--r--app/services/notification_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index af61a94a175..c32ece50885 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -89,7 +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(merge_request.merge_event.author) if merge_request.merged?
+ recipients.delete(current_user)
recipients.each do |recipient|
mailer.merged_merge_request_email(recipient.id, merge_request.id, current_user.id)