96dded3ec8
This changes the email "From" field from "gitlab@example.com" to either:
* "John Doe <gitlab@example.com>" if the author of the action is known,
* "GitLab <gitlab@example.com>" otherwise.
Rationale: this allow mails to appear as if they were sent by the
author. It appears in the mailbox more like a real discussion between
the sender and the receiver ("John sent: we should refactor this") and
less like a robot notifying about something.
38 lines
1.2 KiB
Ruby
38 lines
1.2 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
|
|
mail(from: sender(@note.author_id),
|
|
to: 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
|
|
mail(from: sender(@note.author_id),
|
|
to: 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
|
|
mail(from: sender(@note.author_id),
|
|
to: 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
|
|
mail(from: sender(@note.author_id),
|
|
to: recipient(recipient_id),
|
|
subject: subject("Note on wall"))
|
|
end
|
|
end
|
|
end
|