diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-26 07:35:26 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-26 07:38:52 +0100 |
commit | 329db2c5dedbddace96af2c343443dcba52c170b (patch) | |
tree | 0d63ce8a20477661e7682da897a0f3c080233f05 /app | |
parent | 2953e0d19b46a937ee9d84139adbc263c8e89757 (diff) | |
download | gitlab-ce-329db2c5dedbddace96af2c343443dcba52c170b.tar.gz |
Fix EmailsOnPush.fix-emailsonpush
Diffstat (limited to 'app')
-rw-r--r-- | app/workers/emails_on_push_worker.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb index 89fa2117dd2..1d21addece6 100644 --- a/app/workers/emails_on_push_worker.rb +++ b/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"] |