diff options
Diffstat (limited to 'app/mailers/emails/merge_requests.rb')
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 83d37a365de..6a2b447f4a0 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -15,15 +15,15 @@ module Emails end # existing_commits - an array containing the first and last commits - def push_to_merge_request_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil, new_commits: [], total_new_commits_count: nil, existing_commits: [], total_existing_commits_count: nil) + def push_to_merge_request_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil, new_commits:, total_new_commits_count:, existing_commits:, total_existing_commits_count:) setup_merge_request_mail(merge_request_id, recipient_id) @new_commits = new_commits - @total_new_commits_count = total_new_commits_count || @new_commits.length + @total_new_commits_count = total_new_commits_count @total_stripped_new_commits_count = @total_new_commits_count - @new_commits.length @existing_commits = existing_commits - @total_existing_commits_count = total_existing_commits_count || @existing_commits.length + @total_existing_commits_count = total_existing_commits_count @updated_by_user = User.find(updated_by_user_id) |