summaryrefslogtreecommitdiff
path: root/app/views/notify/merged_merge_request_email.text.haml
diff options
context:
space:
mode:
authorIzaak Alpert <ialpert@blackberry.com>2013-07-12 12:23:42 -0400
committerIzaak Alpert <ialpert@blackberry.com>2013-07-17 22:46:38 -0400
commit0ef055a4aef76d20668a40717fb33bfe41599cfb (patch)
treecaa845c06e1b0c61dce3038474383696ad2ea691 /app/views/notify/merged_merge_request_email.text.haml
parent09112dbb1df2669b0042d6d785a5469a9855ac20 (diff)
downloadgitlab-ce-0ef055a4aef76d20668a40717fb33bfe41599cfb.tar.gz
MR on fork: Email fixes, style fixes
-Removed many extra spaces I added -Fixed email templates to be consistent/better looking GITLAB-894, GITLAB-895, (GITLAB-858) Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
Diffstat (limited to 'app/views/notify/merged_merge_request_email.text.haml')
-rw-r--r--app/views/notify/merged_merge_request_email.text.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/merged_merge_request_email.text.haml b/app/views/notify/merged_merge_request_email.text.haml
index 5f19473fae0..ca18d8f30e5 100644
--- a/app/views/notify/merged_merge_request_email.text.haml
+++ b/app/views/notify/merged_merge_request_email.text.haml
@@ -2,7 +2,7 @@
Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
-Project:Branches: #{@merge_request.source_project.path_with_namespace}/#{@merge_request.source_branch} - #{@merge_request.target_project.path_with_namespace}#{@merge_request.target_branch}
+Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} to #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch}
Author: #{@merge_request.author_name}
Assignee: #{@merge_request.assignee_name}