diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-22 08:37:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-22 08:37:55 +0000 |
| commit | df8dd6dea39a45b18dd5b05b396a1cc30ab1ff85 (patch) | |
| tree | 854a8bf08436674b5a319636ba3890bfb78162e8 /app/views | |
| parent | 39c434630adcf7853457e2936ccd7c66e0245e8a (diff) | |
| parent | 5adc08596287ccb28e0b6489896b71d4943750ae (diff) | |
| download | gitlab-ce-df8dd6dea39a45b18dd5b05b396a1cc30ab1ff85.tar.gz | |
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
Diffstat (limited to 'app/views')
3 files changed, 7 insertions, 7 deletions
diff --git a/app/views/notify/project_was_not_exported_email.html.haml b/app/views/notify/project_was_not_exported_email.html.haml index c9e9ade2cf1..c888da29c17 100644 --- 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} diff --git a/app/views/notify/project_was_not_exported_email.text.erb b/app/views/notify/project_was_not_exported_email.text.erb deleted file mode 100644 index a07f6edacf7..00000000000 --- a/app/views/notify/project_was_not_exported_email.text.erb +++ /dev/null @@ -1,6 +0,0 @@ -Project <%= @project.name %> couldn't be exported. - -The errors we encountered were: - -- @errors.each do |error| -<%= error %>
\ No newline at end of file diff --git a/app/views/notify/project_was_not_exported_email.text.haml b/app/views/notify/project_was_not_exported_email.text.haml new file mode 100644 index 00000000000..b27cb620b9e --- /dev/null +++ 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}
\ No newline at end of file |