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
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

View file

@ -1,7 +1,2 @@
%p %p
= "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}" = "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}

View file

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

View file

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