466b768bb3
This fixes email threading in Mail.app, that doesn't like when a thread doesn't have stable recipients. For instance, here is a possible sender-recipient combinations before: From: A To: Me New issue From: B To: Me Reply on new issue From: A To: Me Another reply Mail.app doesn't see B as a participant to the original email thread, and decides to break the thread: it will group all messages from A together, and separately all messages from B. This commit makes the thread look like this: From: A To: gitlab/project Cc: Me New issue From: B To: gitlab/project Cc: Me Reply on new issue From: A To: gitlab/project Cc: Me Another reply Mail.app sees a common recipient, and group the thread correctly.
44 lines
1.6 KiB
Ruby
44 lines
1.6 KiB
Ruby
module Emails
|
|
module Notes
|
|
def note_commit_email(recipient_id, note_id)
|
|
@note = Note.find(note_id)
|
|
@commit = @note.noteable
|
|
@project = @note.project
|
|
@target_url = project_commit_url(@project, @commit, anchor: "note_#{@note.id}")
|
|
mail(from: sender(@note.author_id),
|
|
cc: recipient(recipient_id),
|
|
subject: subject("#{@commit.title} (#{@commit.short_id})"))
|
|
end
|
|
|
|
def note_issue_email(recipient_id, note_id)
|
|
@note = Note.find(note_id)
|
|
@issue = @note.noteable
|
|
@project = @note.project
|
|
@target_url = project_issue_url(@project, @issue, anchor: "note_#{@note.id}")
|
|
set_reference("issue_#{@issue.id}")
|
|
mail(from: sender(@note.author_id),
|
|
cc: recipient(recipient_id),
|
|
subject: subject("#{@issue.title} (##{@issue.iid})"))
|
|
end
|
|
|
|
def note_merge_request_email(recipient_id, note_id)
|
|
@note = Note.find(note_id)
|
|
@merge_request = @note.noteable
|
|
@project = @note.project
|
|
@target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{@note.id}")
|
|
set_reference("merge_request_#{@merge_request.id}")
|
|
mail(from: sender(@note.author_id),
|
|
cc: recipient(recipient_id),
|
|
subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
|
|
end
|
|
|
|
def note_wall_email(recipient_id, note_id)
|
|
@note = Note.find(note_id)
|
|
@project = @note.project
|
|
@target_url = project_wall_url(@note.project, anchor: "note_#{@note.id}")
|
|
mail(from: sender(@note.author_id),
|
|
cc: recipient(recipient_id),
|
|
subject: subject("Note on wall"))
|
|
end
|
|
end
|
|
end
|