From 539c70c7d64589656cce804282725b97e28e49ff Mon Sep 17 00:00:00 2001
From: Izaak Alpert <ialpert@blackberry.com>
Date: Wed, 17 Jul 2013 10:35:11 -0400
Subject: Update emails to describe path using for_fork?

Forked MR's will print

Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch>

Non forked MR's will print

Branch <source_branch> -> <target_branch>

Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038
---
 app/views/notify/closed_merge_request_email.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/views/notify/closed_merge_request_email.html.haml')

diff --git a/app/views/notify/closed_merge_request_email.html.haml b/app/views/notify/closed_merge_request_email.html.haml
index 306c1ff8f60..c6b45b1710a 100644
--- a/app/views/notify/closed_merge_request_email.html.haml
+++ b/app/views/notify/closed_merge_request_email.html.haml
@@ -1,9 +1,9 @@
 %p
   = "Merge Request #{@merge_request.id} was closed by #{@updated_by.name}"
 %p
-  = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
+  = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.target_project, @merge_request)
 %p
-  Projects:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} &rarr; #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch}
+  != merge_path_description(@merge_request, '&rarr;')
 %p
   Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
 
-- 
cgit v1.2.1