deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make Notify#new_merge_request_email resque friendly.

Browse source
This commit is contained in:
Robb Kidd 2012-05-15 19:41:37 -04:00
parent 39061af9f8
commit e660043d22
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/notify/new_merge_request_email.html.haml
View file

@ -5,16 +5,14 @@
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
New Merge Request
= link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@project, @merge_request)
= link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request)
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%tr
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:style => "padding: 15px 0 15px;", :valign => "top"}
%p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch}
%p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
Asignee: #{@merge_request.author.name} → #{@merge_request.assignee.name}
Asignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
%td