Download as
Browse Code »

Commit 058c48845bf64f09a2bf7bb475f51fad77e4eee1

Authored by Dmitriy Zaporozhets
2 parents 8c1201ef 17b3da07
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'fix_merge_request_emails' into 'master' 

Remove markdown syntax from notification emails

Merge request notifications once again gained markdown syntax :smile: In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c55352d39a88a5c878cc81f59f5328fa and it was recently changed back to use the markdown style.
Showing 6 changed files with 9 additions and 9 deletions   Show diff stats
app/mailers/emails/merge_requests.rb
  Diff comments   View file @058c488
@@ -6,7 +6,7 @@ module Emails @@ -6,7 +6,7 @@ module Emails
6 @target_url = project_merge_request_url(@project, @merge_request) 6 @target_url = project_merge_request_url(@project, @merge_request)
7 mail(from: sender(@merge_request.author_id), 7 mail(from: sender(@merge_request.author_id),
8 to: recipient(recipient_id), 8 to: recipient(recipient_id),
9 - subject: subject("#{@merge_request.title} (!#{@merge_request.iid})")) 9 + subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
10 end 10 end
11 11
12 def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id) 12 def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id)
@@ -16,7 +16,7 @@ module Emails @@ -16,7 +16,7 @@ module Emails
16 @target_url = project_merge_request_url(@project, @merge_request) 16 @target_url = project_merge_request_url(@project, @merge_request)
17 mail(from: sender(updated_by_user_id), 17 mail(from: sender(updated_by_user_id),
18 to: recipient(recipient_id), 18 to: recipient(recipient_id),
19 - subject: subject("#{@merge_request.title} (!#{@merge_request.iid})")) 19 + subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
20 end 20 end
21 21
22 def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id) 22 def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
@@ -26,7 +26,7 @@ module Emails @@ -26,7 +26,7 @@ module Emails
26 @target_url = project_merge_request_url(@project, @merge_request) 26 @target_url = project_merge_request_url(@project, @merge_request)
27 mail(from: sender(updated_by_user_id), 27 mail(from: sender(updated_by_user_id),
28 to: recipient(recipient_id), 28 to: recipient(recipient_id),
29 - subject: subject("#{@merge_request.title} (!#{@merge_request.iid})")) 29 + subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
30 end 30 end
31 31
32 def merged_merge_request_email(recipient_id, merge_request_id, updated_by_user_id) 32 def merged_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
@@ -35,7 +35,7 @@ module Emails @@ -35,7 +35,7 @@ module Emails
35 @target_url = project_merge_request_url(@project, @merge_request) 35 @target_url = project_merge_request_url(@project, @merge_request)
36 mail(from: sender(updated_by_user_id), 36 mail(from: sender(updated_by_user_id),
37 to: recipient(recipient_id), 37 to: recipient(recipient_id),
38 - subject: subject("#{@merge_request.title} (!#{@merge_request.iid})")) 38 + subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
39 end 39 end
40 end 40 end
41 41
app/mailers/emails/notes.rb
  Diff comments   View file @058c488
@@ -27,7 +27,7 @@ module Emails @@ -27,7 +27,7 @@ module Emails
27 @target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{@note.id}") 27 @target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{@note.id}")
28 mail(from: sender(@note.author_id), 28 mail(from: sender(@note.author_id),
29 to: recipient(recipient_id), 29 to: recipient(recipient_id),
30 - subject: subject("#{@merge_request.title} (!#{@merge_request.iid})")) 30 + subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
31 end 31 end
32 32
33 def note_wall_email(recipient_id, note_id) 33 def note_wall_email(recipient_id, note_id)
app/views/notify/closed_merge_request_email.html.haml
  Diff comments   View file @058c488
1 %p 1 %p
2 - = "Merge Request !#{@merge_request.iid} was closed by #{@updated_by.name}" 2 + = "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
app/views/notify/closed_merge_request_email.text.haml
  Diff comments   View file @058c488
1 -= "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}" 1 += "Merge Request ##{@merge_request.iid} was closed by #{@updated_by.name}"
2 2
3 Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} 3 Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
4 4
app/views/notify/merged_merge_request_email.html.haml
  Diff comments   View file @058c488
1 %p 1 %p
2 - = "Merge Request !#{@merge_request.iid} was merged" 2 + = "Merge Request ##{@merge_request.iid} was merged"
app/views/notify/merged_merge_request_email.text.haml
  Diff comments   View file @058c488
1 -= "Merge Request #{@merge_request.iid} was merged" 1 += "Merge Request ##{@merge_request.iid} was merged"
2 2
3 Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} 3 Merge Request Url: #{project_merge_request_url(@merge_request.target_project, @merge_request)}
4 4