Add option to send EmailsOnPush from committer email if domain matches.

See #1809.

1 files changed, 7 insertions, 1 deletions

diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb
index 86693ad0c7e..a5653665bfb 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -14,6 +14,7 @@
 #
 
 class EmailsOnPushService < Service
+  prop_accessor :send_from_committer_email
   prop_accessor :recipients
   validates :recipients, presence: true, if: :activated?
 
@@ -29,12 +30,17 @@ class EmailsOnPushService < Service
     'emails_on_push'
   end
 
+  def send_from_committer_email?
+    self.send_from_committer_email == "1"
+  end
+
   def execute(push_data)
-    EmailsOnPushWorker.perform_async(project_id, recipients, push_data)
+    EmailsOnPushWorker.perform_async(project_id, recipients, push_data, self.send_from_committer_email?)
   end
 
   def fields
     [
+      { type: 'checkbox', name: 'send_from_committer_email', title: "Send from committer email if domain matches" },
       { type: 'textarea', name: 'recipients', placeholder: 'Emails separated by whitespace' },
     ]
   end