From d09c58e541c93198f40c72645776417e20887024 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sat, 30 Jun 2018 16:48:59 +0530 Subject: [PATCH 1/2] Support html-sanitizer >= 2.7.1 --- debian/patches/html-sanitizer-2.8.patch | 13 +++++++++++++ debian/patches/series | 1 + 2 files changed, 14 insertions(+) create mode 100644 debian/patches/html-sanitizer-2.8.patch diff --git a/debian/patches/html-sanitizer-2.8.patch b/debian/patches/html-sanitizer-2.8.patch new file mode 100644 index 0000000000..d2f999c0d2 --- /dev/null +++ b/debian/patches/html-sanitizer-2.8.patch @@ -0,0 +1,13 @@ +Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/48415 + +--- a/lib/banzai/filter/sanitization_filter.rb ++++ b/lib/banzai/filter/sanitization_filter.rb +@@ -8,7 +8,7 @@ + TABLE_ALIGNMENT_PATTERN = /text-align: (?center|left|right)/ + + def whitelist +- whitelist = super ++ whitelist = super.dup + + customize_whitelist(whitelist) + diff --git a/debian/patches/series b/debian/patches/series index 31d04139a6..4e35a002fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ 895871-markdown.patch +html-sanitizer-2.8.patch 0050-relax-stable-libs.patch 0100-remove-development-test.patch 0108-make-mysql-optional.patch From 38503e3f5286529ef948e5956659a05dc89ebf93 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sat, 30 Jun 2018 16:52:25 +0530 Subject: [PATCH 2/2] update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5a46fc2b0b..1090642bb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gitlab (10.7.6+dfsg-2) experimental; urgency=medium + + * Support html-sanitizer >= 2.7.1 (see upstream issue 48415) + + -- Pirate Praveen Sat, 30 Jun 2018 16:51:41 +0530 + gitlab (10.7.6+dfsg-1) experimental; urgency=medium * New upstream version 10.7.6+dfsg