summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-04 15:57:53 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-04 15:57:53 +0000
commit1d945945bb66871dcebefef5824740c823fd7b09 (patch)
tree14549a380b962a0009480b49cfac4fe833730376
parentef3e0931b904ea79630d4d47f4e40dd3ede92f79 (diff)
parent10871732df078dc17e1c6c540a2ce18098ee21f0 (diff)
downloadgitlab-ce-1d945945bb66871dcebefef5824740c823fd7b09.tar.gz
Merge branch 'sn-push-email-plussign' into 'master'
Use entity number for plus sign in push emails Was doing some testing today and found that both outlook and gmail had issues displaying the html content produced for push emails when a file was added. This is how gmail shows it: ![Gmail_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/24be115dbae97997bc02e2ec70d9870c/Gmail_name.png) And this is for Outlook: ![Outlook_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/4b5a54956139d36d78f9c61c83e99928/Outlook_name.png) iOS devices work with the &plus; entity, as does Mail on OS X, but I'm wondering if it is only available for newer html parsers (a quick browse on the w3c site seems to show that it was added in html 5). Changing the entity to `&#43;` and both gmail and outlook and iOS and Mail. See merge request !721
-rw-r--r--app/views/notify/repository_push_email.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml
index a374a662333..12f83aae04b 100644
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
@@ -35,7 +35,7 @@
= diff.new_path
- elsif diff.new_file
%span.new-file
- &plus;
+ &#43;
= diff.new_path
- else
= diff.new_path