summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-07-05 12:58:21 +0100
committerSean McGivern <sean@gitlab.com>2018-07-06 12:17:36 +0100
commit4b7f035aa86bde3b14f761b52e1634d8c13f59c2 (patch)
tree30827f02bdb52f2e9a848dddbc97d8f0f5822137
parentbf9fd9c3fc3ded123458093efdcdae33f083300d (diff)
downloadgitlab-ce-4b7f035aa86bde3b14f761b52e1634d8c13f59c2.tar.gz
Extract EE-specific lines from NotificationService
-rw-r--r--app/services/notification_service.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 636cfbf5b45..8c6221af788 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -135,6 +135,8 @@ class NotificationService
# * watchers of the mr's labels
# * users with custom level checked with "new merge request"
#
+ # In EE, approvers of the merge request are also included
+ #
def new_merge_request(merge_request, current_user)
new_resource_email(merge_request, :new_merge_request_email)
end
@@ -256,6 +258,10 @@ class NotificationService
# ignore gitlab service messages
return true if note.cross_reference? && note.system?
+ send_new_note_notifications(note)
+ end
+
+ def send_new_note_notifications(note)
notify_method = "note_#{note.to_ability_name}_email".to_sym
recipients = NotificationRecipientService.build_new_note_recipients(note)