summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-03-30 12:58:06 +0100
committerSean McGivern <sean@gitlab.com>2018-03-30 12:58:06 +0100
commitddb23d3b2ba7c646cff6a5d21957194fc3474418 (patch)
tree746675e221d4e552cbf7551b259f76b7645e5c99 /app/services
parentf4c8517fec6d53e079f465d594ddef531e12c0af (diff)
downloadgitlab-ce-ddb23d3b2ba7c646cff6a5d21957194fc3474418.tar.gz
Send issue due emails to all participants
Diffstat (limited to 'app/services')
-rw-r--r--app/services/notification_recipient_service.rb4
-rw-r--r--app/services/notification_service.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/notification_recipient_service.rb b/app/services/notification_recipient_service.rb
index c7c64356e30..c4da679defe 100644
--- a/app/services/notification_recipient_service.rb
+++ b/app/services/notification_recipient_service.rb
@@ -230,7 +230,7 @@ module NotificationRecipientService
add_subscribed_users
- if [:new_issue, :new_merge_request, :due_date_issue].include?(custom_action)
+ if [:new_issue, :new_merge_request].include?(custom_action)
# These will all be participants as well, but adding with the :mention
# type ensures that users with the mention notification level will
# receive them, too.
@@ -238,7 +238,7 @@ module NotificationRecipientService
# Add the assigned users, if any
assignees = case custom_action
- when :new_issue, :due_date_issue
+ when :new_issue
target.assignees
else
target.assignee
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index f6d9020b9a1..9d6cfd21266 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -363,7 +363,7 @@ class NotificationService
end
end
- def issue_due_email(issue)
+ def issue_due(issue)
recipients = NotificationRecipientService.build_recipients(
issue,
issue.author,