diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 10:35:11 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:48:03 -0400 |
| commit | 539c70c7d64589656cce804282725b97e28e49ff (patch) | |
| tree | c181018c64097323006b2d303b810fdb99035997 /app/views/notify/closed_merge_request_email.html.haml | |
| parent | d99594273d57b2d5ed7c748b3185712960b89478 (diff) | |
| download | gitlab-ce-539c70c7d64589656cce804282725b97e28e49ff.tar.gz | |
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
Diffstat (limited to 'app/views/notify/closed_merge_request_email.html.haml')
| -rw-r--r-- | app/views/notify/closed_merge_request_email.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
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} → #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch} + != merge_path_description(@merge_request, '→') %p Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} |