Merge branch 'avoid-null-characters-in-notification-emails' into 'master'

Add newlines to end of email template files

See merge request gitlab-org/gitlab!42594

app/views/devise/mailer/confirmation_instructions.text.erb

-<%= render partial: "confirmation_instructions_#{@resource.is_a?(User) ? 'account' : 'secondary'}" %>
+<%= render partial: "confirmation_instructions_#{@resource.is_a?(User) ? 'account' : 'secondary'}" %>
\ No newline at end of file

app/views/notify/issue_status_changed_email.text.erb

 Issue was <%= @issue_status %> by <%= sanitize_name(@updated_by.name) %>
 
 Issue <%= @issue.iid %>: <%= url_for(project_issue_url(@issue.project, @issue)) %>
-

ee/app/views/layouts/mailer/_additional_text.text.erb

 <% if Gitlab::CurrentSettings.email_additional_text.present? %>
 
 <%= Gitlab::CurrentSettings.email_additional_text %>
-<% end %>
+<% end %>
\ No newline at end of file

ee/app/views/layouts/mailer/devise.text.erb

@@ -2,4 +2,4 @@
 
 ---
 You're receiving this email because of your account on <%= Gitlab.config.gitlab.host %>.
-<%# EE-specific start %><%= render 'layouts/mailer/additional_text' %><%# EE-specific end %>
+<%# EE-specific start %><%= render 'layouts/mailer/additional_text' %><%# EE-specific end %>
\ No newline at end of file

ee/app/views/notify/policy_revoked_personal_access_tokens_email.text.erb

@@ -2,4 +2,4 @@
 
 <%= n_('The following personal access token: %{token_names} was revoked, because a new policy to expire personal access tokens were set.', 'The following personal access tokens: %{token_names} were revoked, because a new policy to expire personal access tokens were set.', @revoked_token_names.size) % { token_names: @revoked_token_names.to_sentence } %>
 
-<%= _('You can create new ones at your Personal Access Tokens settings %{pat_link}') % { pat_link: @target_url } %>
+<%= _('You can create new ones at your Personal Access Tokens settings %{pat_link}') % { pat_link: @target_url } %>
\ No newline at end of file