Revert "Split notification integration into another branch"

This reverts commit 1404aa8677969a03ed56e8f8350257f317f576d8.

2 files changed, 18 insertions, 8 deletions

diff --git a/app/services/ci/send_pipeline_notification_service.rb b/app/services/ci/send_pipeline_notification_service.rb
index ceb182801f7..cfbcad5dadf 100644
--- a/app/services/ci/send_pipeline_notification_service.rb
+++ b/app/services/ci/send_pipeline_notification_service.rb
@@ -6,14 +6,8 @@ module Ci
       @pipeline = new_pipeline
     end
 
-    def execute(recipients)
-      email_template = "pipeline_#{pipeline.status}_email"
-
-      return unless Notify.respond_to?(email_template)
-
-      recipients.each do |to|
-        Notify.public_send(email_template, pipeline, to).deliver_later
-      end
+    def execute(recipients = nil)
+      notification_service.pipeline_finished(pipeline, recipients)
     end
   end
 end
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 72712afc07e..65091c2b8af 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -312,6 +312,22 @@ class NotificationService
     mailer.project_was_not_exported_email(current_user, project, errors).deliver_later
   end
 
+  def pipeline_finished(pipeline, recipients = nil)
+    email_template = "pipeline_#{pipeline.status}_email"
+
+    return unless mailer.respond_to?(email_template)
+
+    recipients ||= build_recipients(
+      pipeline,
+      pipeline.project,
+      nil, # The acting user, who won't be added to recipients
+      action: pipeline.status)
+
+    recipients.each do |to|
+      mailer.public_send(email_template, pipeline, to.email).deliver_later
+    end
+  end
+
   protected
 
   # Get project/group users with CUSTOM notification level