Commit cf3f22cc9961b83dc56fdb49bb6a4a8b8bb732b1
1 parent
22ec3fa1
Exists in
master
and in
4 other branches
Corrent link for MR diff note in email
Showing
1 changed file
with
15 additions
and
11 deletions
Show diff stats
app/views/notify/note_merge_request_email.html.haml
| 1 | %td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} | 1 | %td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} |
| 2 | %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"} | 2 | %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"} |
| 3 | %tr | 3 | %tr |
| 4 | - %td{style: "font-size: 1px; line-height: 1px;", width: "21"} | 4 | + %td{width: "21"} |
| 5 | %td{align: "left", style: "padding: 20px 0 0;"} | 5 | %td{align: "left", style: "padding: 20px 0 0;"} |
| 6 | - %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} | ||
| 7 | - = "New comment for Merge Request !#{@merge_request.id}" | ||
| 8 | - = link_to_gfm truncate(@merge_request.title, length: 16), project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") | ||
| 9 | - %td{style: "font-size: 1px; line-height: 1px;", width: "21"} | 6 | + %h2{style: "color:#646464; font-weight: normal;"} |
| 7 | + - if @note.for_diff_line? | ||
| 8 | + = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") | ||
| 9 | + - else | ||
| 10 | + = link_to "New comment", project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}") | ||
| 11 | + for Merge Request ##{@merge_request.id} | ||
| 12 | + %cite "#{truncate(@merge_request.title, length: 20)}" | ||
| 13 | + %td{width: "21"} | ||
| 10 | %tr | 14 | %tr |
| 11 | - %td{style: "font-size: 1px; line-height: 1px;", width: "21"} | ||
| 12 | - %td{style: "padding: 15px 0 15px;", valign: "top"} | ||
| 13 | - %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} | ||
| 14 | - %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name} | 15 | + %td{width: "21"} |
| 16 | + %td | ||
| 17 | + %p | ||
| 18 | + %strong #{@note.author_name} | ||
| 15 | left next message: | 19 | left next message: |
| 16 | %br | 20 | %br |
| 17 | %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"} | 21 | %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"} |
| 18 | %tr | 22 | %tr |
| 19 | %td{valign: "top"} | 23 | %td{valign: "top"} |
| 20 | - %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" } | 24 | + %div{ style: "background:#f5f5f5; padding:10px 20px;border:1px solid #ddd" } |
| 21 | = markdown(@note.note) | 25 | = markdown(@note.note) |
| 22 | - %td{style: "font-size: 1px; line-height: 1px;", width: "21"} | 26 | + %td{width: "21"} |
| 23 | 27 |