Read about our upcoming Code of Conduct on this issue

Commit 089f5b91 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'emailsonpush-hellip' into 'master'

Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2229.

Since the page is encoded as UTF-8, we don't need HTML entities anymore and can just use the character.

See merge request !521
......@@ -4,6 +4,7 @@ v 7.10.0 (unreleased)
- Allow users to be invited by email to join a group or project.
- Don't crash when project repository doesn't exist.
- Add config var to block auto-created LDAP users.
- Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.
- Fix broken file browsing with a submodule that contains a relative link (Stan Hu)
- Fix persistent XSS vulnerability around profile website URLs.
- Fix project import URL regex to prevent arbitary local repos from being imported.
......
......@@ -77,7 +77,7 @@ def title
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 @@ def description
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
......
......@@ -14,7 +14,7 @@
message = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec sodales id felis id blandit. Vivamus egestas lacinia lacus, sed rutrum mauris.'
allow(commit).to receive(:safe_message).and_return(message)
expect(commit.title).to eq("#{message[0..79]}&hellip;")
expect(commit.title).to eq("#{message[0..79]}")
end
it "truncates a message with a newline before 80 characters at the newline" do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment