diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-04 16:49:24 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-04 16:49:24 +0400 |
| commit | 640a3c5c89cc2d20382f4c1045e4b0b05964176a (patch) | |
| tree | 15d11214be45eb471fc58a004bf3def784b0a189 /app | |
| parent | 18e4e997644aa0772153938106e4fc798a12e10f (diff) | |
| parent | 330251de91e2078fe77d2bc26931a818eaa63076 (diff) | |
Merge pull request #7661 from cirosantilli/factor-issue-mr-email
Fix missing to on reassign Merge Request email to unassigned.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/notify/_reassigned_issuable_email.html.haml | 10 | ||||
| -rw-r--r-- | app/views/notify/reassigned_issue_email.html.haml | 12 | ||||
| -rw-r--r-- | app/views/notify/reassigned_merge_request_email.html.haml | 8 |
3 files changed, 12 insertions, 18 deletions
diff --git a/app/views/notify/_reassigned_issuable_email.html.haml b/app/views/notify/_reassigned_issuable_email.html.haml new file mode 100644 index 00000000000..56d81b2ed2e --- /dev/null +++ b/app/views/notify/_reassigned_issuable_email.html.haml @@ -0,0 +1,10 @@ +%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_issue_email.html.haml b/app/views/notify/reassigned_issue_email.html.haml index f1458df5c7b..498ba8b8365 100644 --- a/app/views/notify/reassigned_issue_email.html.haml +++ b/app/views/notify/reassigned_issue_email.html.haml @@ -1,11 +1 @@ -%p - Assignee changed - - if @previous_assignee - from - %strong #{@previous_assignee.name} - to - - if @issue.assignee_id - %strong #{@issue.assignee_name} - - else - %strong Unassigned - += render 'reassigned_issuable_email', issuable: @issue diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml index 00aee6bc952..2a650130f59 100644 --- a/app/views/notify/reassigned_merge_request_email.html.haml +++ b/app/views/notify/reassigned_merge_request_email.html.haml @@ -1,7 +1 @@ -%p - Assignee changed - - if @previous_assignee - from - %strong #{@previous_assignee.name} - to - %strong #{@merge_request.assignee_name} += render 'reassigned_issuable_email', issuable: @merge_request |