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 /app | |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/models/wiki_page.rb | 2 |
1 files changed, 1 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 |