Download as
Browse Code »

Commit ad278c4e7468cc7aac8af27199bc6851853cf779

Authored by Pierre de La Morinerie
1 parent 306744bb
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Make the merge request notification emails more readable 

Emphasize the meaningful informations, and remove the less needed ones:

* Use "!" to identify a merge request
* Write the name of the commented file for diff notes
* Don't show the assignee in the "merged merge request" email
Showing 3 changed files with 8 additions and 18 deletions   Show diff stats
app/views/notify/closed_merge_request_email.html.haml
  Diff comments   View file @ad278c4
1 1 %p
2   - = "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
3   -%p
4   - != merge_path_description(@merge_request, '→')
5   -%p
6   - Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
7   -
  2 + = "Merge Request !#{@merge_request.iid} was closed by #{@updated_by.name}"
... ...
app/views/notify/merged_merge_request_email.html.haml
  Diff comments   View file @ad278c4
1 1 %p
2   - = "Merge Request #{@merge_request.iid} was merged"
3   -%p
4   - != merge_path_description(@merge_request, '→')
5   -%p
6   - Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
7   -
  2 + = "Merge Request !#{@merge_request.iid} was merged"
... ...
app/views/notify/note_merge_request_email.html.haml
  Diff comments   View file @ad278c4
1   -%p.details
2   - - if @note.for_diff_line?
3   - = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
4   - - else
5   - = link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
6   - for Merge Request ##{@merge_request.iid}
  1 +- if @note.diff_file_name
  2 + %p.details
  3 + New comment on diff for
  4 + = link_to @note.diff_file_name, @target_url
  5 + \:
  6 +
7 7 = render 'note_message'
... ...