Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9c8c5e9d
Commit
9c8c5e9d
authored
Oct 17, 2016
by
amaia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: commit messages being double-escaped in activies tab
parent
c9d7ba4d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
CHANGELOG.md
CHANGELOG.md
+1
-0
lib/banzai/filter/html_entity_filter.rb
lib/banzai/filter/html_entity_filter.rb
+1
-1
spec/lib/banzai/filter/html_entity_filter_spec.rb
spec/lib/banzai/filter/html_entity_filter_spec.rb
+5
-0
No files found.
CHANGELOG.md
View file @
9c8c5e9d
...
...
@@ -119,6 +119,7 @@ Please view this file on the master branch, on stable branches it's out of date.
-
Cleanup Ci::ApplicationController. !6757 (Takuya Noguchi)
-
Fixes padding in all clipboard icons that have .btn class
-
Fix a typo in doc/api/labels.md
-
Fix double-escaping in activities tab (Alexandre Maia)
-
API: all unknown routing will be handled with 404 Not Found
-
Add docs for request profiling
-
Make guests unable to view MRs on private projects
...
...
lib/banzai/filter/html_entity_filter.rb
View file @
9c8c5e9d
...
...
@@ -5,7 +5,7 @@ module Banzai
# Text filter that escapes these HTML entities: & " < >
class
HtmlEntityFilter
<
HTML
::
Pipeline
::
TextFilter
def
call
ERB
::
Util
.
html_escape
(
text
)
ERB
::
Util
.
html_escape
_once
(
text
)
end
end
end
...
...
spec/lib/banzai/filter/html_entity_filter_spec.rb
View file @
9c8c5e9d
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment