diff options
| author | gitlabhq <m@gitlabhq.com> | 2012-04-23 15:32:56 +0300 |
|---|---|---|
| committer | gitlabhq <m@gitlabhq.com> | 2012-04-23 15:32:56 +0300 |
| commit | d97a9aa4a44ff9f452144fad348fd9d7e3b48260 (patch) | |
| tree | 905c33874b064778199f806749d5688e33d64be3 /app/views/notify | |
| parent | 21f3da23589d50038728393f0badc6255b5762ca (diff) | |
| download | gitlab-ce-d97a9aa4a44ff9f452144fad348fd9d7e3b48260.tar.gz | |
fixed email markdownv2.4.1
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/note_commit_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/note_issue_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/note_merge_request_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/note_wall_email.html.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/notify/note_commit_email.html.haml b/app/views/notify/note_commit_email.html.haml index 41501deebb8..aee8fe6c5da 100644 --- a/app/views/notify/note_commit_email.html.haml +++ b/app/views/notify/note_commit_email.html.haml @@ -18,6 +18,6 @@ %tr %td{:valign => "top"} %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 + = markdown(@note.note) %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 28db944f8e1..eb2cbc0c33d 100644 --- a/app/views/notify/note_issue_email.html.haml +++ b/app/views/notify/note_issue_email.html.haml @@ -20,6 +20,6 @@ %tr %td{:valign => "top"} %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 + = markdown(@note.note) %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 6a97f9cadc3..e2dfec35b7f 100644 --- a/app/views/notify/note_merge_request_email.html.haml +++ b/app/views/notify/note_merge_request_email.html.haml @@ -18,6 +18,6 @@ %tr %td{:valign => "top"} %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 + = markdown(@note.note) %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 77b58f15eef..da18f64f937 100644 --- a/app/views/notify/note_wall_email.html.haml +++ b/app/views/notify/note_wall_email.html.haml @@ -18,5 +18,5 @@ %tr %td{:valign => "top"} %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 + = markdown(@note.note) %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} |