kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make the merge request notification emails more readable

Browse source 
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
This commit is contained in:
Pierre de La Morinerie 2014-02-18 17:32:12 +01:00
parent 306744bbb0
commit ad278c4e74
3 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/notify/closed_merge_request_email.html.haml
View file

@ -1,7 +1,2 @@
%p
= "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
%p
!= merge_path_description(@merge_request, '→')
%p
Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
= "Merge Request !#{@merge_request.iid} was closed by #{@updated_by.name}"

7
app/views/notify/merged_merge_request_email.html.haml
View file

@ -1,7 +1,2 @@
%p
= "Merge Request #{@merge_request.iid} was merged"
%p
!= merge_path_description(@merge_request, '→')
%p
Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
= "Merge Request !#{@merge_request.iid} was merged"

12
app/views/notify/note_merge_request_email.html.haml
View file

@ -1,7 +1,7 @@
%p.details
- if @note.for_diff_line?
= link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
- else
= link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
for Merge Request ##{@merge_request.iid}
- if @note.diff_file_name
%p.details
New comment on diff for
= link_to @note.diff_file_name, @target_url
\:
= render 'note_message'