summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-15 12:37:19 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-15 12:37:19 +0000
commit089f5b914eed846c32a00f0fa71f7cfdca1dd654 (patch)
tree38adda4cf82cc4d506b2f1744c25e2ce0017d53f /spec/models
parent4ab22a8c32acda065b8173616f7bf116b637a4a8 (diff)
parent5662b2413206db20f935a0dffb5f12debd248447 (diff)
downloadgitlab-ce-089f5b914eed846c32a00f0fa71f7cfdca1dd654.tar.gz
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
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/commit_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 8b3d88640da..11cc7762ce4 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -14,7 +14,7 @@ describe Commit do
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