Commit 0429740af6ce639beb1d31505c4eaa2f325893eb
1 parent
99490159
Exists in
master
and in
4 other branches
Add @project variable to merge request emails
After this change project name appears in the top part of email when you open/close/accept merge request. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
4 additions
and
0 deletions
Show diff stats
app/mailers/emails/merge_requests.rb
| @@ -2,23 +2,27 @@ module Emails | @@ -2,23 +2,27 @@ module Emails | ||
| 2 | module MergeRequests | 2 | module MergeRequests |
| 3 | def new_merge_request_email(recipient_id, merge_request_id) | 3 | def new_merge_request_email(recipient_id, merge_request_id) |
| 4 | @merge_request = MergeRequest.find(merge_request_id) | 4 | @merge_request = MergeRequest.find(merge_request_id) |
| 5 | + @project = @merge_request.project | ||
| 5 | mail(to: recipient(recipient_id), subject: subject("New merge request ##{@merge_request.iid}", @merge_request.title)) | 6 | mail(to: recipient(recipient_id), subject: subject("New merge request ##{@merge_request.iid}", @merge_request.title)) |
| 6 | end | 7 | end |
| 7 | 8 | ||
| 8 | def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id) | 9 | def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id) |
| 9 | @merge_request = MergeRequest.find(merge_request_id) | 10 | @merge_request = MergeRequest.find(merge_request_id) |
| 10 | @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id | 11 | @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id |
| 12 | + @project = @merge_request.project | ||
| 11 | mail(to: recipient(recipient_id), subject: subject("Changed merge request ##{@merge_request.iid}", @merge_request.title)) | 13 | mail(to: recipient(recipient_id), subject: subject("Changed merge request ##{@merge_request.iid}", @merge_request.title)) |
| 12 | end | 14 | end |
| 13 | 15 | ||
| 14 | def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id) | 16 | def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id) |
| 15 | @merge_request = MergeRequest.find(merge_request_id) | 17 | @merge_request = MergeRequest.find(merge_request_id) |
| 16 | @updated_by = User.find updated_by_user_id | 18 | @updated_by = User.find updated_by_user_id |
| 19 | + @project = @merge_request.project | ||
| 17 | mail(to: recipient(recipient_id), subject: subject("Closed merge request ##{@merge_request.iid}", @merge_request.title)) | 20 | mail(to: recipient(recipient_id), subject: subject("Closed merge request ##{@merge_request.iid}", @merge_request.title)) |
| 18 | end | 21 | end |
| 19 | 22 | ||
| 20 | def merged_merge_request_email(recipient_id, merge_request_id) | 23 | def merged_merge_request_email(recipient_id, merge_request_id) |
| 21 | @merge_request = MergeRequest.find(merge_request_id) | 24 | @merge_request = MergeRequest.find(merge_request_id) |
| 25 | + @project = @merge_request.project | ||
| 22 | mail(to: recipient(recipient_id), subject: subject("Accepted merge request ##{@merge_request.iid}", @merge_request.title)) | 26 | mail(to: recipient(recipient_id), subject: subject("Accepted merge request ##{@merge_request.iid}", @merge_request.title)) |
| 23 | end | 27 | end |
| 24 | end | 28 | end |