Merge branch 'fix-emailsonpush' into 'master'

Fix EmailsOnPush.

See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2185.

See merge request !459

CHANGELOG

@@ -41,6 +41,9 @@ v 7.10.0 (unreleased)
   - Don't mark merge request as updated when merge status relative to target branch changes.
   - Link note avatar to user.
   - Make Git-over-SSH errors more descriptive.
+  - Fix EmailsOnPush.
+
+v 7.9.0
   - Send EmailsOnPush email when branch or tag is created or deleted.
   - Faster merge request processing for large repository
   - Prevent doubling AJAX request with each commit visit via Turbolink

app/workers/emails_on_push_worker.rb

@@ -1,7 +1,15 @@
 class EmailsOnPushWorker
   include Sidekiq::Worker
 
-  def perform(project_id, recipients, push_data, send_from_committer_email: false, disable_diffs: false)
+  def perform(project_id, recipients, push_data, options = {})
+    options.symbolize_keys!
+    options.reverse_merge!(
+      send_from_committer_email:  false, 
+      disable_diffs:              false
+    )
+    send_from_committer_email = options[:send_from_committer_email]
+    disable_diffs = options[:disable_diffs]
+
     project = Project.find(project_id)
     before_sha = push_data["before"]
     after_sha = push_data["after"]