diff options
| author | David Planella <dplanella@gitlab.com> | 2019-05-28 22:33:07 +0200 |
|---|---|---|
| committer | David Planella <dplanella@gitlab.com> | 2019-05-28 22:33:07 +0200 |
| commit | bebc7b58b84b4061fec25c7bf1858c1abd274957 (patch) | |
| tree | 1b3372425af4451960d6bfba249bd1cc6eed15e5 /app/views/notify/reassigned_merge_request_email.text.erb | |
| parent | 38e55d6b96e2bee43e7773182679fbcfe6f41ff3 (diff) | |
| parent | 8b200634c4909f12cd012c3197c4ffbaf50b99d5 (diff) | |
| download | gitlab-ce-bebc7b58b84b4061fec25c7bf1858c1abd274957.tar.gz | |
Merged changes from master
Diffstat (limited to 'app/views/notify/reassigned_merge_request_email.text.erb')
| -rw-r--r-- | app/views/notify/reassigned_merge_request_email.text.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/reassigned_merge_request_email.text.erb b/app/views/notify/reassigned_merge_request_email.text.erb index 998a40fefde..82ec7aa0fa4 100644 --- a/app/views/notify/reassigned_merge_request_email.text.erb +++ b/app/views/notify/reassigned_merge_request_email.text.erb @@ -2,5 +2,5 @@ Reassigned Merge Request <%= @merge_request.iid %> <%= url_for([@merge_request.project.namespace.becomes(Namespace), @merge_request.project, @merge_request, { only_path: false }]) %> -Assignee changed <%= "from #{@previous_assignee.name}" if @previous_assignee -%> - to <%= "#{@merge_request.assignee_id ? @merge_request.assignee_name : 'Unassigned'}" %> +Assignee changed <%= "from #{sanitize_name(@previous_assignees.map(&:name).to_sentence)}" if @previous_assignees.any? -%> + to <%= "#{@merge_request.assignees.any? ? @merge_request.assignee_list : 'Unassigned'}" %> |