Merge branch 'fix_merge_request_emails' into 'master'
Remove markdown syntax from notification emails
Merge request notifications once again gained markdown syntax 😄 In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c5
and it was recently changed back to use the markdown style.
This commit is contained in:
commit
058c48845b
6 changed files with 9 additions and 9 deletions
|
@ -6,7 +6,7 @@ module Emails
|
|||
@target_url = project_merge_request_url(@project, @merge_request)
|
||||
mail(from: sender(@merge_request.author_id),
|
||||
to: recipient(recipient_id),
|
||||
subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
|
||||
subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
|
||||
end
|
||||
|
||||
def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id)
|
||||
|
@ -16,7 +16,7 @@ module Emails
|
|||
@target_url = project_merge_request_url(@project, @merge_request)
|
||||
mail(from: sender(updated_by_user_id),
|
||||
to: recipient(recipient_id),
|
||||
subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
|
||||
subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
|
||||
end
|
||||
|
||||
def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
|
||||
|
@ -26,7 +26,7 @@ module Emails
|
|||
@target_url = project_merge_request_url(@project, @merge_request)
|
||||
mail(from: sender(updated_by_user_id),
|
||||
to: recipient(recipient_id),
|
||||
subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
|
||||
subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
|
||||
end
|
||||
|
||||
def merged_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
|
||||
|
@ -35,7 +35,7 @@ module Emails
|
|||
@target_url = project_merge_request_url(@project, @merge_request)
|
||||
mail(from: sender(updated_by_user_id),
|
||||
to: recipient(recipient_id),
|
||||
subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
|
||||
subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ module Emails
|
|||
@target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{@note.id}")
|
||||
mail(from: sender(@note.author_id),
|
||||
to: recipient(recipient_id),
|
||||
subject: subject("#{@merge_request.title} (!#{@merge_request.iid})"))
|
||||
subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
|
||||
end
|
||||
|
||||
def note_wall_email(recipient_id, note_id)
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
%p
|
||||
= "Merge Request !#{@merge_request.iid} was closed by #{@updated_by.name}"
|
||||
= "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
= "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
|
||||
= "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
|
||||
|
||||
Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
%p
|
||||
= "Merge Request !#{@merge_request.iid} was merged"
|
||||
= "Merge Request ##{@merge_request.iid} was merged"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
= "Merge Request #{@merge_request.iid} was merged"
|
||||
= "Merge Request ##{@merge_request.iid} was merged"
|
||||
|
||||
Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
|
||||
|
||||
|
|
Loading…
Reference in a new issue