diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-08-29 18:47:49 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-08-29 18:47:49 +0000 |
| commit | 5db02773f7dcd5638d7797cd39cf9cd70b03abfd (patch) | |
| tree | 98aacb620b0ded3c930847e48d9175717c2fbde7 | |
| parent | 3ee7d74694824d4b0649f9579dfa3927a9772e51 (diff) | |
| parent | 7e0960f6e220c2ae54abb457508c9b20fa132a9f (diff) | |
| download | gitlab-ce-5db02773f7dcd5638d7797cd39cf9cd70b03abfd.tar.gz | |
Merge branch 'tc-cleanup-issue-created-text-mail' into 'master'
Bring text mail for new issue & MR more in line
See merge request gitlab-org/gitlab-ce!32254
| -rw-r--r-- | app/views/notify/new_issue_email.text.erb | 10 | ||||
| -rw-r--r-- | app/views/notify/new_merge_request_email.text.erb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/tc-cleanup-issue-created-text-mail.yml | 5 |
3 files changed, 10 insertions, 9 deletions
diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb index b93d95ef02f..bd61db3ee76 100644 --- a/app/views/notify/new_issue_email.text.erb +++ b/app/views/notify/new_issue_email.text.erb @@ -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 %> diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb index 6c0d7b1e60b..f4b0ed0f886 100644 --- a/app/views/notify/new_merge_request_email.text.erb +++ b/app/views/notify/new_merge_request_email.text.erb @@ -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 %> diff --git a/changelogs/unreleased/tc-cleanup-issue-created-text-mail.yml b/changelogs/unreleased/tc-cleanup-issue-created-text-mail.yml new file mode 100644 index 00000000000..cc590ee38eb --- /dev/null +++ b/changelogs/unreleased/tc-cleanup-issue-created-text-mail.yml @@ -0,0 +1,5 @@ +--- +title: Bring text mail for new issue & MR more in line +merge_request: 32254 +author: +type: changed |