diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 18:25:19 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 18:25:19 +0000 |
| commit | a94f8a3c5e00f137eacfb7fda54157cb4fb77b5f (patch) | |
| tree | a813e9abe9edd2c6bd7a297a150c5e397d287f13 | |
| parent | b8164321fedfd17479ce7ac0b4961bf1e5929da0 (diff) | |
| parent | 329db2c5dedbddace96af2c343443dcba52c170b (diff) | |
| download | gitlab-ce-a94f8a3c5e00f137eacfb7fda54157cb4fb77b5f.tar.gz | |
Merge branch 'fix-emailsonpush' into 'master'
Fix EmailsOnPush.
See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2185.
See merge request !459
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/workers/emails_on_push_worker.rb | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5ae65205517..549e48b3895 100644 --- a/CHANGELOG +++ b/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 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"] |