Download as
Browse Code »

Commit 0429740af6ce639beb1d31505c4eaa2f325893eb

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

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
  Diff comments   View file @0429740
... ... @@ -2,23 +2,27 @@ module Emails
2 2 module MergeRequests
3 3 def new_merge_request_email(recipient_id, merge_request_id)
4 4 @merge_request = MergeRequest.find(merge_request_id)
  5 + @project = @merge_request.project
5 6 mail(to: recipient(recipient_id), subject: subject("New merge request ##{@merge_request.iid}", @merge_request.title))
6 7 end
7 8  
8 9 def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
9 10 @merge_request = MergeRequest.find(merge_request_id)
10 11 @previous_assignee = User.find_by_id(previous_assignee_id) if previous_assignee_id
  12 + @project = @merge_request.project
11 13 mail(to: recipient(recipient_id), subject: subject("Changed merge request ##{@merge_request.iid}", @merge_request.title))
12 14 end
13 15  
14 16 def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
15 17 @merge_request = MergeRequest.find(merge_request_id)
16 18 @updated_by = User.find updated_by_user_id
  19 + @project = @merge_request.project
17 20 mail(to: recipient(recipient_id), subject: subject("Closed merge request ##{@merge_request.iid}", @merge_request.title))
18 21 end
19 22  
20 23 def merged_merge_request_email(recipient_id, merge_request_id)
21 24 @merge_request = MergeRequest.find(merge_request_id)
  25 + @project = @merge_request.project
22 26 mail(to: recipient(recipient_id), subject: subject("Accepted merge request ##{@merge_request.iid}", @merge_request.title))
23 27 end
24 28 end
... ...