From 330251de91e2078fe77d2bc26931a818eaa63076 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Mon, 1 Sep 2014 17:27:02 +0200
Subject: [PATCH] Fix missing to on reassign MR email to unassigned.
Factors out MR and issue email.
---
.../notify/_reassigned_issuable_email.html.haml | 10 ++++++++++
app/views/notify/reassigned_issue_email.html.haml | 12 +-----------
.../notify/reassigned_merge_request_email.html.haml | 8 +-------
3 files changed, 12 insertions(+), 18 deletions(-)
create mode 100644 app/views/notify/_reassigned_issuable_email.html.haml
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
--
GitLab