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
2016-06-22 08:37:55 +00:00 · 2016-06-22 08:37:55 +00:00 · df8dd6dea3
parent 39c434630a 5adc085962
commit df8dd6dea3
3 changed files with 7 additions and 7 deletions
--- 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
@ -1,6 +0,0 @@
-Project <%= @project.name %> couldn't be exported.
-
-The errors we encountered were:
-
- @errors.each do |error|
-<%= error %>
--- a/app/views/notify/project_was_not_exported_email.text.haml
+++ b/app/views/notify/project_was_not_exported_email.text.haml
@ -0,0 +1,6 @@
+= "Project #{@project.name} couldn't be exported."
+
+= "The errors we encountered were:"
+
+- @errors.each do |error|
+  #{error}