Commit e660043d22bd686f6799a46b506a4c2ad53e46fa
1 parent
39061af9
Exists in
master
and in
4 other branches
Make Notify#new_merge_request_email resque friendly.
Showing
3 changed files
with
6 additions
and
10 deletions
Show diff stats
app/mailers/notify.rb
| @@ -45,11 +45,9 @@ class Notify < ActionMailer::Base | @@ -45,11 +45,9 @@ class Notify < ActionMailer::Base | ||
| 45 | mail(:to => recipient.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project_name} ") | 45 | mail(:to => recipient.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project_name} ") |
| 46 | end | 46 | end |
| 47 | 47 | ||
| 48 | - def new_merge_request_email(merge_request) | ||
| 49 | - @merge_request = MergeRequest.find(merge_request['id']) | ||
| 50 | - @user = @merge_request.assignee | ||
| 51 | - @project = @merge_request.project | ||
| 52 | - mail(:to => @user.email, :subject => "gitlab | new merge request | #{@merge_request.title} ") | 48 | + def new_merge_request_email(merge_request_id) |
| 49 | + @merge_request = MergeRequest.find(merge_request_id) | ||
| 50 | + mail(:to => @merge_request.assignee_email, :subject => "gitlab | new merge request | #{@merge_request.title} ") | ||
| 53 | end | 51 | end |
| 54 | 52 | ||
| 55 | def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id) | 53 | def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id) |
app/views/notify/new_merge_request_email.html.haml
| @@ -5,16 +5,14 @@ | @@ -5,16 +5,14 @@ | ||
| 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; "} | 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 | 7 | New Merge Request |
| 8 | - = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@project, @merge_request) | 8 | + = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request) |
| 9 | %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} | 9 | %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} |
| 10 | %tr | 10 | %tr |
| 11 | %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} | 11 | %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} |
| 12 | %td{:style => "padding: 15px 0 15px;", :valign => "top"} | 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; "} | 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 | Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch} | 14 | Branches: #{@merge_request.source_branch} → #{@merge_request.target_branch} |
| 15 | - | ||
| 16 | %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} | 15 | %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} |
| 17 | - Asignee: #{@merge_request.author.name} → #{@merge_request.assignee.name} | ||
| 18 | - | 16 | + Asignee: #{@merge_request.author_name} → #{@merge_request.assignee_name} |
| 19 | %td | 17 | %td |
| 20 | 18 |
spec/mailers/notify_spec.rb
| @@ -101,7 +101,7 @@ describe Notify do | @@ -101,7 +101,7 @@ describe Notify do | ||
| 101 | let(:merge_request) { Factory.create(:merge_request, :assignee => assignee, :project => project) } | 101 | let(:merge_request) { Factory.create(:merge_request, :assignee => assignee, :project => project) } |
| 102 | 102 | ||
| 103 | describe 'that are new' do | 103 | describe 'that are new' do |
| 104 | - subject { Notify.new_merge_request_email(merge_request) } | 104 | + subject { Notify.new_merge_request_email(merge_request.id) } |
| 105 | 105 | ||
| 106 | it_behaves_like 'an assignee email' | 106 | it_behaves_like 'an assignee email' |
| 107 | 107 |