Merge branch 'master' into stretch-backports

debian/changelog

@@ -1,9 +1,15 @@
-gitlab (10.7.6+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+gitlab (10.7.6+dfsg-2~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.
 
  -- Pirate Praveen <praveen@debian.org>  Sun, 03 Jun 2018 21:03:45 +0530
 
+gitlab (10.7.6+dfsg-2) experimental; urgency=medium
+
+  * Support html-sanitizer >= 2.7.1 (see upstream issue 48415)
+
+ -- Pirate Praveen <praveen@debian.org>  Sat, 30 Jun 2018 16:51:41 +0530
+
 gitlab (10.7.6+dfsg-1) experimental; urgency=medium
 
   * New upstream version 10.7.6+dfsg

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: (?<alignment>center|left|right)/
+ 
+       def whitelist
+-        whitelist = super
++	whitelist = super.dup
+ 
+         customize_whitelist(whitelist)
+ 

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