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

Merge branch 'tc-cleanup-issue-created-text-mail' into 'master'

Browse source 
Bring text mail for new issue & MR more in line

See merge request gitlab-org/gitlab-ce!32254
This commit is contained in:
Mike Greiling 2019-08-29 18:47:49 +00:00
commit 5db02773f7
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/views/notify/new_issue_email.text.erb
View file

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

4
app/views/notify/new_merge_request_email.text.erb
View file

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

5
changelogs/unreleased/tc-cleanup-issue-created-text-mail.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Bring text mail for new issue & MR more in line
merge_request: 32254
author:
type: changed