diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-03-04 12:58:40 +0100 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-03-12 09:26:06 +0100 |
| commit | 3c7e0f45c2d9c242bf45d153bb73e96ce7525a06 (patch) | |
| tree | a905c2a07656dcb1e287b4bdf47b3b118bc36017 /app/views | |
| parent | 3f823068e1f6e3e88d6631de60d9aaf9ecd5e6f9 (diff) | |
| download | gitlab-ce-3c7e0f45c2d9c242bf45d153bb73e96ce7525a06.tar.gz | |
replace images in emails with inline images
This adds the functionality of replacing all images that were uploaded
to gitlab with inline images(base64) in emails.
This change fixes the broken images in emails that 7.8 introduced
Diffstat (limited to 'app/views')
| -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 5272dfa0ede..778a78acf56 100644 --- a/app/views/notify/_note_message.html.haml +++ b/app/views/notify/_note_message.html.haml @@ -1,2 +1,2 @@ %div - = markdown(@note.note) + = replace_image_links_with_base64(markdown(@note.note), @note.project) diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml index f2f8eee18c4..03cbee94608 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 - = markdown(@issue.description) + = replace_image_links_with_base64(markdown(@issue.description), @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 f02d5111b22..729a7bb505d 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 - = markdown(@merge_request.description) + = replace_image_links_with_base64(markdown(@merge_request.description), @merge_request.project) |