Commit 5662b241 authored by Douwe Maan's avatar Douwe Maan

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

parent bf7932bd
Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
- 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