Commit 15ad0ac1 authored by Sean McGivern's avatar Sean McGivern

Merge branch '35686-unescape-wiki-title' into 'master'

Unescape HTML characters in Wiki title

Closes #35686

See merge request !13942
parents 2fc50081 378ee1da
...@@ -84,7 +84,7 @@ class WikiPage ...@@ -84,7 +84,7 @@ class WikiPage
# The formatted title of this page. # The formatted title of this page.
def title def title
if @attributes[:title] if @attributes[:title]
self.class.unhyphenize(@attributes[:title]) CGI.unescape_html(self.class.unhyphenize(@attributes[:title]))
else else
"" ""
end end
......
---
title: Unescape HTML characters in Wiki title
merge_request: 13942
author: Jacopo Beschi @jacopo-beschi
type: fixed
...@@ -281,6 +281,12 @@ describe WikiPage do ...@@ -281,6 +281,12 @@ describe WikiPage do
@page.title = "Import-existing-repositories-into-GitLab" @page.title = "Import-existing-repositories-into-GitLab"
expect(@page.title).to eq("Import existing repositories into GitLab") expect(@page.title).to eq("Import existing repositories into GitLab")
end end
it 'unescapes html' do
@page.title = 'foo & bar'
expect(@page.title).to eq('foo & bar')
end
end end
describe '#directory' do describe '#directory' 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