Merge branch 'fix/error-typo' into 'master'

fix import/export error typo

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18948

See merge request !4847
Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG

@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.9.1 (unreleased)
   - Fix MR-auto-close text added to description. !4836
+  - Fix typo in export failure email. !4847
 
 v 8.9.0
   - Fix builds API response not including commit data

app/views/notify/project_was_not_exported_email.html.haml

@@ -6,4 +6,4 @@
   %ul
   - @errors.each do |error|
     %li
-      error
+      #{error}

app/views/notify/project_was_not_exported_email.text.erb

-Project <%= @project.name %> couldn't be exported.
-
-The errors we encountered were:
-
-- @errors.each do |error|
-<%= error %>
\ No newline at end of file

app/views/notify/project_was_not_exported_email.text.haml

+= "Project #{@project.name} couldn't be exported."
+
+= "The errors we encountered were:"
+
+- @errors.each do |error|
+  #{error}
\ No newline at end of file