diff --git a/debian/changelog b/debian/changelog index cf11a7ab75..aa33445492 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (8.4.3+dfsg-12) unstable; urgency=medium + + [ Libor Klepáč ] + * Add fix-wiki.patch: Fix wiki display (Closes: #815465) + + -- Pirate Praveen Fri, 18 Mar 2016 19:12:10 +0530 + gitlab (8.4.3+dfsg-11) unstable; urgency=medium * Relax stable library versions requirement diff --git a/debian/patches/fix-wiki.patch b/debian/patches/fix-wiki.patch new file mode 100644 index 0000000000..f30f3ecd1b --- /dev/null +++ b/debian/patches/fix-wiki.patch @@ -0,0 +1,12 @@ +diff -ur a/app/models/wiki_page.rb b/app/models/wiki_page.rb +--- a/app/models/wiki_page.rb 2016-01-23 17:45:00.000000000 +0100 ++++ b/app/models/wiki_page.rb 2016-03-03 08:26:25.256512379 +0100 +@@ -62,7 +62,7 @@ + # The raw content of this page. + def content + @attributes[:content] ||= if @page +- @page.raw_data ++ @page.text_data + end + end + diff --git a/debian/patches/series b/debian/patches/series index cf8b543ac5..60808b50ea 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,3 +19,4 @@ 0109-fix-coffee-script.patch source-init-functions.patch pid-log-paths.patch +fix-wiki.patch