gitlab-org--gitlab-foss/app/views/notify/note_merge_request_email.ht...

%p.details
  New comment for Merge Request
  = @merge_request.to_reference
  on
  = render partial: 'note_mr_or_commit_email',
    locals: { note: @note,
    discussion: @discussion}
Add new template to handle both commit & mr notes Currently comments on commits and merge requests do not require merge request- or commit-specific information, but can use the same template. Rather than change the method which calls the template, I opted to keep the templates separate and create a new template to highlight their identicality, while preserving the option to distinguish them from each other in the future. Also removed some of the inconsistencies between text and html email versions. Still needed is a text-only version of git diffs and testing. 2016-08-23 05:36:30 +00:00			`%p.details`
			`New comment for Merge Request`
			`= @merge_request.to_reference`
			`on`
			`= render partial: 'note_mr_or_commit_email',`
			`locals: { note: @note,`
			`discussion: @discussion}`