From 41d439401d3e088ec2f6848d7ad078a213f0e4d7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 13 Feb 2012 20:40:39 +0200 Subject: [PATCH] enable markdown for email notification --- app/views/notify/note_commit_email.html.haml | 4 ++-- app/views/notify/note_issue_email.html.haml | 4 ++-- app/views/notify/note_merge_request_email.html.haml | 4 ++-- app/views/notify/note_wall_email.html.haml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/notify/note_commit_email.html.haml b/app/views/notify/note_commit_email.html.haml index 81001d6..6683d1f 100644 --- a/app/views/notify/note_commit_email.html.haml +++ b/app/views/notify/note_commit_email.html.haml @@ -17,7 +17,7 @@ %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"} %tr %td{:valign => "top"} - %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} - = @note.note + %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" } + = RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml index 7d8e215..28db944 100644 --- a/app/views/notify/note_issue_email.html.haml +++ b/app/views/notify/note_issue_email.html.haml @@ -19,7 +19,7 @@ %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"} %tr %td{:valign => "top"} - %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} - = @note.note + %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" } + = RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml index 27854e2..6a97f9c 100644 --- a/app/views/notify/note_merge_request_email.html.haml +++ b/app/views/notify/note_merge_request_email.html.haml @@ -17,7 +17,7 @@ %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"} %tr %td{:valign => "top"} - %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} - = @note.note + %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" } + = RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} diff --git a/app/views/notify/note_wall_email.html.haml b/app/views/notify/note_wall_email.html.haml index a2bd5a7..77b58f1 100644 --- a/app/views/notify/note_wall_email.html.haml +++ b/app/views/notify/note_wall_email.html.haml @@ -17,6 +17,6 @@ %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"} %tr %td{:valign => "top"} - %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} - = @note.note + %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" } + = RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} -- libgit2 0.21.2