summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 15:45:06 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-14 16:32:11 +0200
commit5662b2413206db20f935a0dffb5f12debd248447 (patch)
tree1101ee8fffb97ea5242b440acc0533fc0dca1941 /app/models
parentbf7932bd06e45f82c7aa80373aa3aa1bf52d4d88 (diff)
downloadgitlab-ce-5662b2413206db20f935a0dffb5f12debd248447.tar.gz
Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellip
Diffstat (limited to 'app/models')
-rw-r--r--app/models/commit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 7a0ad137650..006fa62c8f9 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -77,7 +77,7 @@ class Commit
title_end = title.index("\n")
if (!title_end && title.length > 100) || (title_end && title_end > 100)
- title[0..79] << "&hellip;".html_safe
+ title[0..79] << "…"
else
title.split("\n", 2).first
end
@@ -90,7 +90,7 @@ class Commit
title_end = safe_message.index("\n")
@description ||=
if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
- "&hellip;".html_safe << safe_message[80..-1]
+ "…" << safe_message[80..-1]
else
safe_message.split("\n", 2)[1].try(:chomp)
end