Email on push: dont send email if new branch was pushed or branch was removed

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 10 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 1d4828fe720..8df7313f987 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -36,11 +36,20 @@ class EmailsOnPushService < Service
     before_sha = push_data[:before]
     after_sha = push_data[:after]
     branch = push_data[:ref]
+    author_id = push_data[:user_id]
+
+    if before_sha =~ /^000000/ || after_sha =~ /^000000/
+      # skip if new branch was pushed or branch was removed
+      return true
+    end
 
     compare = Gitlab::Git::Compare.new(project.repository.raw_repository, before_sha, after_sha)
 
+    # Do not send emails if git compare failed
+    return false unless compare && compare.commits.present?
+
     recipients.split(" ").each do |recipient|
-      Notify.delay.repository_push_email(project_id, recipient, branch, compare)
+      Notify.delay.repository_push_email(project_id, recipient, author_id, branch, compare)
     end
   end