Download as
Browse Code »

Commit 41d439401d3e088ec2f6848d7ad078a213f0e4d7

Authored by Dmitriy Zaporozhets
1 parent 7fd29a78
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

enable markdown for email notification

Showing 4 changed files with 8 additions and 8 deletions   Show diff stats
app/views/notify/note_commit_email.html.haml
  Diff comments   View file @41d4394
... ... @@ -17,7 +17,7 @@
17 17 %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
18 18 %tr
19 19 %td{:valign => "top"}
20   - %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
21   - = @note.note
  20 + %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
  21 + = RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
22 22 %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
23 23  
... ...
app/views/notify/note_issue_email.html.haml
  Diff comments   View file @41d4394
... ... @@ -19,7 +19,7 @@
19 19 %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
20 20 %tr
21 21 %td{:valign => "top"}
22   - %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
23   - = @note.note
  22 + %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
  23 + = RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
24 24 %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
25 25  
... ...
app/views/notify/note_merge_request_email.html.haml
  Diff comments   View file @41d4394
... ... @@ -17,7 +17,7 @@
17 17 %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
18 18 %tr
19 19 %td{:valign => "top"}
20   - %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
21   - = @note.note
  20 + %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
  21 + = RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
22 22 %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
23 23  
... ...
app/views/notify/note_wall_email.html.haml
  Diff comments   View file @41d4394
... ... @@ -17,6 +17,6 @@
17 17 %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"}
18 18 %tr
19 19 %td{:valign => "top"}
20   - %cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
21   - = @note.note
  20 + %div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
  21 + = RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
22 22 %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
... ...