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

Merge branch 'fix/error-typo' into 'master'
df8dd6de · Rémy Coutable · 39c43463 · 5adc0859 · df8dd6de · 39c43463
Commit df8dd6de authored Jun 22, 2016 by Rémy Coutable
3 changed files
--- a/app/views/notify/project_was_not_exported_email.html.haml
+++ b/app/views/notify/project_was_not_exported_email.html.haml
@@ -6,4 +6,4 @@
  %ul
  - @errors.each do |error|
    %li
-      error
+      #{error}
--- a/app/views/notify/project_was_not_exported_email.text.erb
+++ b/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
--- a/app/views/notify/project_was_not_exported_email.text.haml
+++ b/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