Download as
Browse Code »

Commit b1e425511fd9f79da5289f1651bb8e9397b384f5

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

restyle and cleanup emails

Showing 14 changed files with 108 additions and 266 deletions   Show diff stats
app/views/layouts/notify.html.haml
  Diff comments   View file @b1e4255
@@ -4,29 +4,19 @@ @@ -4,29 +4,19 @@
4 %title 4 %title
5 GitLab 5 GitLab
6 6
7 - %body{bgcolor: "#EAEAEA", style: "margin: 0; padding: 0; background: #EAEAEA"}  
8 - %table{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 35px 0; background: #EAEAEA;", width: "100%"} 7 + %body
  8 + %h1{style: "background: #EEE; border-bottom: 1px solid #DDD; color: #474D57; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;"}
  9 + GitLab
  10 + - if @project
  11 + \|
  12 + = link_to @project.name_with_namespace, project_url(@project), style: 'color: #29B; text-decoration: none'
  13 + %table{align: "left", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 10px 0;", width: "100%"}
9 %tr 14 %tr
10 - %td{align: "center", style: "margin: 0; padding: 0; background: #EAEAEA;"}  
11 - %table.header{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background:#333", width: "600"}  
12 - %tr  
13 - %td{style: "font-size: 0px;", width: "20"}  
14 - \   
15 - %td{align: "left", style: "padding: 10px 0", width: "580"}  
16 - %h1{style: "color: #BBBBBB; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 32px;"}  
17 - GITLAB  
18 - - if @project  
19 - \/ #{@project.name_with_namespace}  
20 - %table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"}  
21 - %tr= yield  
22 - %tr  
23 - %td{align: "left", colspan: "2", height: "3", style: "padding: font-size: 0; line-height: 0; height: 3px;", width: "600"}  
24 - %table.footer{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; line-height: 10px;", width: "600"}  
25 - %tr  
26 - %td{align: "center", style: "padding: 5px 0 10px; font-size: 11px; color:#7d7a7a; margin: 0; line-height: 1.2;font-family: Helvetica, Arial, sans-serif;", valign: "top"}  
27 - %br  
28 - %p{style: "font-size: 11px; color:#7d7a7a; margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif;"}  
29 - You're receiving this notification because you are a member of the  
30 - - if @project  
31 - #{@project.name_with_namespace}  
32 - project team. 15 + %td{align: "left", style: "margin: 0; padding: 10px;"}
  16 + = yield
  17 + %br
  18 + %tr
  19 + %td{align: "left", style: "margin: 0; padding: 10px;"}
  20 + %p{style: "font-size:small;color:#777"}
  21 + - if @project
  22 + You're receiving this notification because you are a member of the #{@project.name_with_namespace} project team.
app/views/notify/_note_message.html.haml 0 → 100644
  Diff comments   View file @b1e4255
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +%p
  2 + %strong #{@note.author_name}
  3 + left next message:
  4 +
  5 +%cite{style: 'color: #666'}
  6 + = markdown(@note.note)
app/views/notify/issue_status_changed_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{width: "21"}  
5 - %td  
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 - = "Issue was #{@issue_status} by #{@updated_by.name}"  
8 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
9 - %tr  
10 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
11 - %td{align: "left", style: "padding: 20px 0 0;"}  
12 - %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "}  
13 - = "Issue ##{@issue.id}"  
14 - = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title  
15 - %br  
16 - 1 +%p
  2 + = "Issue was #{@issue_status} by #{@updated_by.name}"
  3 +%p
  4 + = "Issue ##{@issue.id}"
  5 + = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
app/views/notify/new_issue_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{width: "21"}  
5 - %td  
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 Issue was created and assigned to you.  
8 - %td{width: "21"}  
9 - %tr  
10 - %td{width: "21"}  
11 - %td{align: "left", style: "padding: 20px 0 0;"}  
12 - %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "}  
13 - = "Issue ##{@issue.id}"  
14 - = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title  
15 - %br 1 +%p
  2 + New Issue was created and assigned to you.
  3 +%p
  4 + = "Issue ##{@issue.id}"
  5 + = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title
app/views/notify/new_merge_request_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
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 Merge Request !#{@merge_request.id}"  
8 - %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "}  
9 - = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)  
10 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
11 - %tr  
12 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
13 - %td{style: "padding: 15px 0 15px;", valign: "top"}  
14 - %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}  
15 - Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch}  
16 - %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}  
17 - Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}  
18 - %td 1 +%p
  2 + = "New Merge Request !#{@merge_request.id}"
  3 +%p
  4 + = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request)
  5 +%p
  6 + Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch}
  7 +%p
  8 + Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
19 9
app/views/notify/new_user_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
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 - Hi #{@user['name']}!  
8 - %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}  
9 - - if Gitlab.config.gitlab.signup_enabled  
10 - Account has been created successfully.  
11 - - else  
12 - Administrator created account for you. Now you are a member of company GitLab application.  
13 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
14 - %tr  
15 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
16 - %td{style: "padding: 15px 0 15px;", valign: "top"}  
17 - %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}  
18 - login..........................................  
19 - %code= @user['email']  
20 - %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 16px;font-family: Helvetica, Arial, sans-serif; "}  
21 - - unless Gitlab.config.gitlab.signup_enabled  
22 - password..................................  
23 - %code= @password  
24 - %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 28px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}  
25 - = link_to "Click here to login", root_url  
26 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
27 - 1 +%p
  2 + Hi #{@user['name']}!
  3 +%p
  4 + - if Gitlab.config.gitlab.signup_enabled
  5 + Account has been created successfully.
  6 + - else
  7 + Administrator created account for you. Now you are a member of company GitLab application.
  8 +%p
  9 + login..........................................
  10 + %code= @user['email']
  11 +%p
  12 + - unless Gitlab.config.gitlab.signup_enabled
  13 + password..................................
  14 + %code= @password
  15 +%p
  16 + = link_to "Click here to login", root_url
app/views/notify/note_commit_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
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 Commit #{@commit.short_id}"  
8 - = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")  
9 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
10 - %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 - left next message:  
16 - %br  
17 - %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}  
18 - %tr  
19 - %td{valign: "top"}  
20 - %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }  
21 - = markdown(@note.note)  
22 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"} 1 +%p
  2 + = "New comment for Commit #{@commit.short_id}"
  3 + = link_to_gfm truncate(@commit.title, length: 16), project_commit_url(@note.project, id: @commit.id, anchor: "note_#{@note.id}")
  4 += render 'note_message'
23 5
app/views/notify/note_issue_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
5 - %td{align: "left", style: "padding: 20px 0 0;"}  
6 - %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}  
7 - = "New comment for Issue ##{@issue.id}"  
8 - = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")  
9 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
10 - %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 - left next message:  
16 - %br  
17 - %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}  
18 - %tr  
19 - %td{valign: "top"}  
20 - %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }  
21 - = markdown(@note.note)  
22 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
23 - 1 +%p
  2 + = "New comment for Issue ##{@issue.id}"
  3 + = link_to_gfm truncate(@issue.title, length: 35), project_issue_url(@issue.project, @issue, anchor: "note_#{@note.id}")
  4 += render 'note_message'
app/views/notify/note_merge_request_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{width: "21"}  
5 - %td  
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"}  
14 - %tr  
15 - %td{width: "21"}  
16 - %td  
17 - %p  
18 - %strong #{@note.author_name}  
19 - left next message:  
20 - %br  
21 - %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}  
22 - %tr  
23 - %td{valign: "top"}  
24 - %div{ style: "background:#f5f5f5; padding:10px 20px;border:1px solid #ddd" }  
25 - = markdown(@note.note)  
26 - %td{width: "21"}  
27 - 1 +%p
  2 + - if @note.for_diff_line?
  3 + = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}")
  4 + - else
  5 + = link_to "New comment", project_merge_request_url(@merge_request.project, @merge_request, anchor: "note_#{@note.id}")
  6 + for Merge Request ##{@merge_request.id}
  7 + %cite "#{truncate(@merge_request.title, length: 20)}"
  8 += render 'note_message'
app/views/notify/note_wall_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
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 message on  
8 - = link_to "Project Wall", wall_project_url(@note.project, anchor: "note_#{@note.id}")  
9 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
10 - %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 - left next message:  
16 - %br  
17 - %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}  
18 - %tr  
19 - %td{valign: "top"}  
20 - %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }  
21 - = markdown(@note.note)  
22 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"} 1 +%p
  2 + New message on
  3 + = link_to "Project Wall", wall_project_url(@note.project, anchor: "note_#{@note.id}")
  4 +
  5 += render 'note_message'
app/views/notify/project_access_granted_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{width: "21"}  
5 - %td  
6 - %h2{style: "color:#646464;" }  
7 - = "You have been granted #{@users_project.project_access_human} access to project"  
8 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
9 - %tr  
10 - %td{width: "21"}  
11 - %td  
12 - %h3  
13 - = link_to project_url(@project) do  
14 - = @project.name_with_namespace  
15 - %br 1 +%p
  2 + = "You have been granted #{@users_project.project_access_human} access to project"
  3 +%p
  4 + = link_to project_url(@project) do
  5 + = @project.name_with_namespace
app/views/notify/project_was_moved_email.html.haml
  Diff comments   View file @b1e4255
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: #555; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}  
3 - %tr  
4 - %td{width: "21"}  
5 - %td  
6 - %h2  
7 - = "Project was moved to another location"  
8 - %td{width: "21"}  
9 - %tr  
10 - %td{width: "21"}  
11 - %td  
12 - %p  
13 - The project is now located under  
14 - = link_to project_url(@project) do  
15 - = @project.name_with_namespace  
16 - %p  
17 - To update the remote url in your local repository run:  
18 - %br  
19 - %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}  
20 - %tr  
21 - %td{valign: "top"}  
22 - %p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }  
23 - git remote set-url origin #{@project.ssh_url_to_repo}  
24 - %br  
25 - %td{ width: "21"} 1 +%p
  2 + = "Project was moved to another location"
  3 +%p
  4 + The project is now located under
  5 + = link_to project_url(@project) do
  6 + = @project.name_with_namespace
  7 +%p
  8 + To update the remote url in your local repository run:
  9 +%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
  10 + git remote set-url origin #{@project.ssh_url_to_repo}
  11 +%br
app/views/notify/reassigned_issue_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
5 - %td  
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 - = "Reassigned Issue ##{@issue.id}"  
8 - = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)  
9 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
10 - %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 - Assignee changed from #{@previous_assignee.name} to #{@issue.assignee_name}  
15 - %td 1 +%p
  2 + = "Reassigned Issue ##{@issue.id}"
  3 + = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue)
  4 +%p
  5 + Assignee changed from
  6 + %strong #{@previous_assignee.name}
  7 + to
  8 + %strong #{@issue.assignee_name}
16 9
app/views/notify/reassigned_merge_request_email.html.haml
  Diff comments   View file @b1e4255
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"}  
3 - %tr  
4 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
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 - = "Reassigned Merge Request !#{@merge_request.id}"  
8 - = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request)  
9 - %td{style: "font-size: 1px; line-height: 1px;", width: "21"}  
10 - %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 - Assignee changed from #{@previous_assignee.name} to #{@merge_request.assignee_name}  
15 - %td  
16 - 1 +%p
  2 + = "Reassigned Merge Request !#{@merge_request.id}"
  3 + = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request)
  4 +%p
  5 + Assignee changed from
  6 + %strong #{@previous_assignee.name}
  7 + to
  8 + %strong #{@merge_request.assignee_name}