Merge branch 'fix-reassigned-mr-email' into 'master'

Fix reassigned MR HTML email

See merge request !11238
This commit is contained in:
Douwe Maan 2017-05-10 15:38:54 +00:00
commit 487aae1c47
2 changed files with 10 additions and 19 deletions

View file

@ -1,10 +0,0 @@
%p
Assignee changed
- if @previous_assignee
from
%strong= @previous_assignee.name
to
- if issuable.assignee_id
%strong= issuable.assignee_name
- else
%strong Unassigned

View file

@ -1,9 +1,10 @@
Reassigned Merge Request #{ @merge_request.iid }
= url_for([@merge_request.project.namespace.becomes(Namespace), @merge_request.project, @merge_request, { only_path: false }])
Assignee changed
- if @previous_assignee
from #{@previous_assignee.name}
to
= @merge_request.assignee_id ? @merge_request.assignee_name : 'Unassigned'
%p
Assignee changed
- if @previous_assignee
from
%strong= @previous_assignee.name
to
- if @merge_request.assignee_id
%strong= @merge_request.assignee_name
- else
%strong Unassigned