Bring text mail for new issue & MR more in line
Make these templates for mail notifications for a new issue and a new merge request more similar. Also remove some leading whitespace in text mails.
This commit is contained in:
parent
78283f8b00
commit
7e0960f6e2
3 changed files with 10 additions and 9 deletions
|
@ -1,9 +1,5 @@
|
|||
<%= sanitize_name(@issue.author_name) %> <%= 'created an issue:' %>
|
||||
<%= sanitize_name(@issue.author_name) %> <%= 'created an issue:' %> <%= url_for(project_issue_url(@issue.project, @issue)) %>
|
||||
|
||||
<% if @issue.assignees.any? -%>
|
||||
<%= assignees_label(@issue) %>
|
||||
<% end %>
|
||||
<%= assignees_label(@issue) if @issue.assignees.any? %>
|
||||
|
||||
<% if @issue.description -%>
|
||||
<%= @issue.description %>
|
||||
<% end %>
|
||||
<%= @issue.description %>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<%= @merge_request.author_name %> <%= 'created a merge request:' %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
|
||||
<%= sanitize_name(@merge_request.author_name) %> <%= 'created a merge request:' %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
|
||||
|
||||
<%= merge_path_description(@merge_request, 'to') %>
|
||||
<%= 'Author:' %> <%= @merge_request.author_name %>
|
||||
<%= assignees_label(@merge_request) %>
|
||||
<%= assignees_label(@merge_request) if @merge_request.assignees.any? %>
|
||||
<%= render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter %>
|
||||
|
||||
<%= @merge_request.description %>
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Bring text mail for new issue & MR more in line
|
||||
merge_request: 32254
|
||||
author:
|
||||
type: changed
|
Loading…
Reference in a new issue