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 15:38:00 +0200 |
commit | a600097188d4283f8fc13671253ccdab3ea73fb8 (patch) | |
tree | b06c96f060ecbb80cc80c1afde551f4ef8e27fd7 | |
parent | 9be991df54a48044d459c34f240e85b9d8b71d1c (diff) | |
download | gitlab-ce-a600097188d4283f8fc13671253ccdab3ea73fb8.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
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/notify/project_was_not_exported_email.html.haml | 2 | ||||
-rw-r--r-- | app/views/notify/project_was_not_exported_email.text.erb | 6 | ||||
-rw-r--r-- | app/views/notify/project_was_not_exported_email.text.haml | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index ed813138070..a7c9e3e1cd2 100644 --- a/CHANGELOG +++ b/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 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 |