diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-22 11:37:55 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-22 16:38:00 +0300 |
| commit | a600097188d4283f8fc13671253ccdab3ea73fb8 (patch) | |
| tree | b06c96f060ecbb80cc80c1afde551f4ef8e27fd7 /app | |
| parent | 9be991df54a48044d459c34f240e85b9d8b71d1c (diff) | |
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>
Diffstat (limited to 'app')
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 |