summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authoramaia <alexandre.maia@gmail.com>2016-10-17 05:53:12 -0700
committeramaia <alexandre.maia@gmail.com>2016-10-18 05:06:02 -0700
commit9c8c5e9dc050f32cec05f6903105ff34d726979b (patch)
tree91a74e2f1eddf65e43e2499242ebaded7082ff39 /spec/lib
parentc9d7ba4d696bfd0198ac75db6e1b2a08b4517f82 (diff)
downloadgitlab-ce-9c8c5e9dc050f32cec05f6903105ff34d726979b.tar.gz
fix: commit messages being double-escaped in activies tab
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/banzai/filter/html_entity_filter_spec.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/lib/banzai/filter/html_entity_filter_spec.rb b/spec/lib/banzai/filter/html_entity_filter_spec.rb
index 4c68ce6d6e4..f9e6bd609f0 100644
--- a/spec/lib/banzai/filter/html_entity_filter_spec.rb
+++ b/spec/lib/banzai/filter/html_entity_filter_spec.rb
@@ -11,4 +11,9 @@ describe Banzai::Filter::HtmlEntityFilter, lib: true do
expect(output).to eq(escaped)
end
+
+ it 'does not double-escape' do
+ escaped = ERB::Util.html_escape("Merge branch 'blabla' into 'master'")
+ expect(filter(escaped)).to eq(escaped)
+ end
end