diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-10 15:38:54 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-10 15:38:54 +0000 |
| commit | 487aae1c47adff3673237144e7de856eccfb1bc8 (patch) | |
| tree | 35622cb7b05146959197ad56d4b23a0b9a44de0d | |
| parent | e85639760cc304f46dc8aaede74693661d06b494 (diff) | |
| parent | dd7c69da1e6a9db5664c3676015f3fb0c77e530b (diff) | |
| download | gitlab-ce-487aae1c47adff3673237144e7de856eccfb1bc8.tar.gz | |
Merge branch 'fix-reassigned-mr-email' into 'master'
Fix reassigned MR HTML email
See merge request !11238
| -rw-r--r-- | app/views/notify/_reassigned_issuable_email.html.haml | 10 | ||||
| -rw-r--r-- | app/views/notify/reassigned_merge_request_email.html.haml | 19 |
2 files changed, 10 insertions, 19 deletions
diff --git a/app/views/notify/_reassigned_issuable_email.html.haml b/app/views/notify/_reassigned_issuable_email.html.haml deleted file mode 100644 index fd35713f79c..00000000000 --- a/app/views/notify/_reassigned_issuable_email.html.haml +++ /dev/null @@ -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 diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml index 841df872857..24c2b08810b 100644 --- a/app/views/notify/reassigned_merge_request_email.html.haml +++ b/app/views/notify/reassigned_merge_request_email.html.haml @@ -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 |