| ... | @@ -5,16 +5,14 @@ |
... | @@ -5,16 +5,14 @@ |
|
|
%td{:align => "left", :style => "padding: 20px 0 0;"}
|
|
%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; "}
|
|
%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
|
|
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"}
|
|
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
|
|
|
%tr
|
|
%tr
|
|
|
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
|
|
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
|
|
|
%td{:style => "padding: 15px 0 15px;", :valign => "top"}
|
|
%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; "}
|
|
%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}
|
|
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; "}
|
|
%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
|
|
%td
|
|
|
|
|
|