diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-04-13 12:32:04 +0200 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-04-13 12:34:47 +0200 |
| commit | 8e9fbd847d8ad44edd7346428276b055c765e252 (patch) | |
| tree | 4011cf6bf9f42cbaed6b4a3093cc7918a7304f62 /app/views/notify | |
| parent | 9c14ed0689ba3e667adbcc179793d7d14d776f79 (diff) | |
| download | gitlab-ce-8e9fbd847d8ad44edd7346428276b055c765e252.tar.gz | |
Revert "Merge branch 'fix_email_images' into 'master'"
This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing
changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634.
This change needed to be reverted,
because not enough email clients support inline images.
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 e796353cec4..3fd4b04ac84 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, reference_only_path: false), @note.project) + = markdown(@note.note, reference_only_path: false) diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml index d4d413b5b44..53a068be52e 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, reference_only_path: false), @issue.project) + = markdown(@issue.description, reference_only_path: false) - 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 60e33227e01..5b7dd117c16 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, reference_only_path: false), @merge_request.project) + = markdown(@merge_request.description, reference_only_path: false) |