summaryrefslogtreecommitdiff
path: root/app/views/notify/new_merge_request_email.html.haml
diff options
context:
space:
mode:
authorPierre de La Morinerie <pierre@capitainetrain.com>2014-02-18 14:27:39 +0100
committerPierre de La Morinerie <pierre@capitainetrain.com>2014-03-03 16:58:44 +0100
commit306744bbb0a5e1fc6253ec9512cbae87df2a94c7 (patch)
treedf004beb36a470f1fabefc98bfc4e9eab702e8c1 /app/views/notify/new_merge_request_email.html.haml
parent7959455f4d5dc25963176b9f83981b17b415996e (diff)
downloadgitlab-ce-306744bbb0a5e1fc6253ec9512cbae87df2a94c7.tar.gz
Simplify the default layout of notification emails
* Less margin: the content appears as the text of the message. * Streamlined footer: everything on one line, with a small separator. * Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display the content of the message. Switching to a simpler layout fixes the issue.
Diffstat (limited to 'app/views/notify/new_merge_request_email.html.haml')
-rw-r--r--app/views/notify/new_merge_request_email.html.haml4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 2c012c4b215..f02d5111b22 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -1,6 +1,4 @@
-%p
- = "New Merge Request ##{@merge_request.iid}"
-%p
+%p.details
!= merge_path_description(@merge_request, '&rarr;')
- if @merge_request.assignee_id.present?