diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 09:53:09 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 09:53:09 +0000 |
| commit | 15ad0ac1e741e462c3742cd4db8ca008a0c4f61d (patch) | |
| tree | adfad3c7934b57cf2584a9d66ed3f5998aa4ab40 | |
| parent | 2fc500819f83edf976879789113673389c55a461 (diff) | |
| parent | 378ee1dac262a490e48334a3dd3300be5f1c7299 (diff) | |
| download | gitlab-ce-15ad0ac1e741e462c3742cd4db8ca008a0c4f61d.tar.gz | |
Merge branch '35686-unescape-wiki-title' into 'master'
Unescape HTML characters in Wiki title
Closes #35686
See merge request !13942
| -rw-r--r-- | app/models/wiki_page.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/35686-unescape-wiki-title.yml | 5 | ||||
| -rw-r--r-- | spec/models/wiki_page_spec.rb | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 5c7c2204374..f2315bb3dbb 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -84,7 +84,7 @@ class WikiPage # The formatted title of this page. def title if @attributes[:title] - self.class.unhyphenize(@attributes[:title]) + CGI.unescape_html(self.class.unhyphenize(@attributes[:title])) else "" end diff --git a/changelogs/unreleased/35686-unescape-wiki-title.yml b/changelogs/unreleased/35686-unescape-wiki-title.yml new file mode 100644 index 00000000000..4b2b7078163 --- /dev/null +++ b/changelogs/unreleased/35686-unescape-wiki-title.yml @@ -0,0 +1,5 @@ +--- +title: Unescape HTML characters in Wiki title +merge_request: 13942 +author: Jacopo Beschi @jacopo-beschi +type: fixed diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb index 40a222be24d..9ef8d117123 100644 --- a/spec/models/wiki_page_spec.rb +++ b/spec/models/wiki_page_spec.rb @@ -281,6 +281,12 @@ describe WikiPage do @page.title = "Import-existing-repositories-into-GitLab" expect(@page.title).to eq("Import existing repositories into GitLab") end + + it 'unescapes html' do + @page.title = 'foo & bar' + + expect(@page.title).to eq('foo & bar') + end end describe '#directory' do |