Commit 2f585840dbf4910d3a4b40c1771ff1dd4525625d
1 parent
ecf3b2e4
Exists in
master
and in
4 other branches
Fixed new mr/issue emails
Showing
4 changed files
with
12 additions
and
7 deletions
Show diff stats
app/mailers/emails/issues.rb
| 1 | module Emails | 1 | module Emails |
| 2 | module Issues | 2 | module Issues |
| 3 | - def new_issue_email(issue_id) | 3 | + def new_issue_email(recipient_id, issue_id) |
| 4 | @issue = Issue.find(issue_id) | 4 | @issue = Issue.find(issue_id) |
| 5 | @project = @issue.project | 5 | @project = @issue.project |
| 6 | - mail(to: @issue.assignee_email, subject: subject("new issue ##{@issue.id}", @issue.title)) | 6 | + mail(to: recipient(recipient_id), subject: subject("new issue ##{@issue.id}", @issue.title)) |
| 7 | end | 7 | end |
| 8 | 8 | ||
| 9 | def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id) | 9 | def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id) |
app/mailers/emails/merge_requests.rb
| 1 | module Emails | 1 | module Emails |
| 2 | module MergeRequests | 2 | module MergeRequests |
| 3 | - def new_merge_request_email(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 | @project = @merge_request.project |
| 6 | - mail(to: @merge_request.assignee_email, subject: subject("new merge request !#{@merge_request.id}", @merge_request.title)) | 6 | + mail(to: recipient(recipient_id), subject: subject("new merge request !#{@merge_request.id}", @merge_request.title)) |
| 7 | end | 7 | end |
| 8 | 8 | ||
| 9 | 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) |
app/views/notify/new_issue_email.html.haml
| 1 | %p | 1 | %p |
| 2 | - New Issue was created and assigned to you. | 2 | + New Issue was created. |
| 3 | %p | 3 | %p |
| 4 | = "Issue ##{@issue.id}" | 4 | = "Issue ##{@issue.id}" |
| 5 | = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title | 5 | = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title |
| 6 | +%p | ||
| 7 | + Author: #{@issue.author_name} | ||
| 8 | +%p | ||
| 9 | + Assignee: #{@issue.assignee_name} |
app/views/notify/new_issue_email.text.erb
| 1 | -New Issue was created and assigned to you. | 1 | +New Issue was created. |
| 2 | 2 | ||
| 3 | - | ||
| 4 | Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> | 3 | Issue <%= @issue.id %>: <%= url_for(project_issue_url(@issue.project, @issue)) %> |
| 4 | +Author: <%= @issue.author_name %> | ||
| 5 | +Asignee: <%= @issue.assignee_name %> |