diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-25 10:03:55 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-27 10:39:05 +0100 |
| commit | e08d947e77fa79b723bb1a32794f99d3c39ee463 (patch) | |
| tree | d2ae3829f2ba93fa2e9bc998dbd457ba70e8e86a /app/views/notify | |
| parent | c5de2ce742f7f2a472eadcd9a2e0d93992930180 (diff) | |
| download | gitlab-ce-e08d947e77fa79b723bb1a32794f99d3c39ee463.tar.gz | |
Use relative URL for Markdown references, except in mails.email-full-url
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/_note_message.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/new_issue_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/new_merge_request_email.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml index 778a78acf56..e796353cec4 100644 --- a/app/views/notify/_note_message.html.haml +++ b/app/views/notify/_note_message.html.haml @@ -1,2 +1,2 @@ %div - = replace_image_links_with_base64(markdown(@note.note), @note.project) + = replace_image_links_with_base64(markdown(@note.note, reference_only_path: false), @note.project) diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml index 03cbee94608..d4d413b5b44 100644 --- a/app/views/notify/new_issue_email.html.haml +++ b/app/views/notify/new_issue_email.html.haml @@ -1,5 +1,5 @@ -if @issue.description - = replace_image_links_with_base64(markdown(@issue.description), @issue.project) + = replace_image_links_with_base64(markdown(@issue.description, reference_only_path: false), @issue.project) - if @issue.assignee_id.present? %p diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index 729a7bb505d..60e33227e01 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -6,4 +6,4 @@ Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} -if @merge_request.description - = replace_image_links_with_base64(markdown(@merge_request.description), @merge_request.project) + = replace_image_links_with_base64(markdown(@merge_request.description, reference_only_path: false), @merge_request.project) |