diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-13 21:36:47 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-13 21:36:47 +0300 |
| commit | 5e9666880376b3f53edb95cba77b5642d3cc1810 (patch) | |
| tree | c41d0997dbfa7211d3f66ffd0cf3cc2b88d7221e /app/services | |
| parent | b35378a938e22f745b6c6ea32b53cb50f9b6c627 (diff) | |
| parent | 9493791d1212f484217e74757550353a5ef07dcf (diff) | |
Merge branch 'option-to-be-notified-of-own-activity' into 'master'
Add option to receive email notifications about your own activity
See merge request !8836
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/notification_service.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index b2cc39763f3..3734e3c4253 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -217,7 +217,7 @@ class NotificationService recipients = reject_unsubscribed_users(recipients, note.noteable) recipients = reject_users_without_access(recipients, note.noteable) - recipients.delete(note.author) + recipients.delete(note.author) unless note.author.notified_of_own_activity? recipients = recipients.uniq notify_method = "note_#{note.to_ability_name}_email".to_sym @@ -327,8 +327,9 @@ class NotificationService recipients ||= build_recipients( pipeline, pipeline.project, - nil, # The acting user, who won't be added to recipients - action: pipeline.status).map(&:notification_email) + pipeline.user, + action: pipeline.status, + skip_current_user: false).map(&:notification_email) if recipients.any? mailer.public_send(email_template, pipeline, recipients).deliver_later @@ -627,7 +628,7 @@ class NotificationService recipients = reject_unsubscribed_users(recipients, target) recipients = reject_users_without_access(recipients, target) - recipients.delete(current_user) if skip_current_user + recipients.delete(current_user) if skip_current_user && !current_user.notified_of_own_activity? recipients.uniq end @@ -636,7 +637,7 @@ class NotificationService recipients = add_labels_subscribers([], project, target, labels: labels) recipients = reject_unsubscribed_users(recipients, target) recipients = reject_users_without_access(recipients, target) - recipients.delete(current_user) + recipients.delete(current_user) unless current_user.notified_of_own_activity? recipients.uniq end |