diff options
| author | Pierre de La Morinerie <pierre@capitainetrain.com> | 2014-02-18 14:44:00 +0100 |
|---|---|---|
| committer | Pierre de La Morinerie <pierre@capitainetrain.com> | 2014-03-03 16:58:44 +0100 |
| commit | 8e421d2bcb8088fa065b9bd8a6e1776c5140f4cd (patch) | |
| tree | e3fbc1b99fb44d8a8f8764acfc69a3e920c4c70e /app/views/notify | |
| parent | b59d105c0e541520073761b15ce575be3518cef2 (diff) | |
| download | gitlab-ce-8e421d2bcb8088fa065b9bd8a6e1776c5140f4cd.tar.gz | |
Add the description to the "new issue" and "new merge request" emails
Previously the content of the issue or merge request was missing from
the email.
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/new_issue_email.html.haml | 12 | ||||
| -rw-r--r-- | app/views/notify/new_merge_request_email.html.haml | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml index 05a91424713..f2f8eee18c4 100644 --- a/app/views/notify/new_issue_email.html.haml +++ b/app/views/notify/new_issue_email.html.haml @@ -1,6 +1,6 @@ -%p - New Issue was created. -%p - Author: #{@issue.author_name} -%p - Assignee: #{@issue.assignee_name} +-if @issue.description + = markdown(@issue.description) + +- if @issue.assignee_id.present? + %p + Assignee: #{@issue.assignee_name} diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index bc52824c44f..2c012c4b215 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -2,6 +2,10 @@ = "New Merge Request ##{@merge_request.iid}" %p != merge_path_description(@merge_request, '→') -%p - Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} +- if @merge_request.assignee_id.present? + %p + Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} + +-if @merge_request.description + = markdown(@merge_request.description) |