Merge tag 'debian/12.8.8-5' into buster-fasttrack

gitlab Debian release 12.8.8-5

debian/changelog

@@ -1,3 +1,24 @@
+gitlab (12.8.8-5) experimental; urgency=medium
+
+  * Add a work around for missing assets/select2.png error on web console
+    (See upstream issue #213245)
+
+ -- Pirate Praveen <praveen@debian.org>  Fri, 03 Apr 2020 17:44:31 +0530
+
+gitlab (12.8.8-4) experimental; urgency=medium
+
+  * Refresh protobuf compat patch (remove fuzz)
+  * Use jquery.waitforimages from npmjs.com (packaged version is broken)
+
+ -- Pirate Praveen <praveen@debian.org>  Thu, 02 Apr 2020 20:22:43 +0530
+
+gitlab (12.8.8-3) experimental; urgency=medium
+
+  * Tighten dependencies for dependencies in buster-backports
+  * Tighten dependency on ruby-grape-path-helpers (fixes issue creation)
+
+ -- Pirate Praveen <praveen@debian.org>  Wed, 01 Apr 2020 20:24:55 +0530
+
 gitlab (12.8.8-2+fto10+1) buster-fasttrack; urgency=medium
 
   * Rebuild for buster-fasttrack.

debian/control

@@ -370,7 +370,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  node-jed,
  node-jquery (>= 3.4~),
  node-jquery-ujs,
- node-jquery.waitforimages,
+# Broken
+# node-jquery.waitforimages,
  node-js-cookie,
  node-jszip,
  node-jszip-utils,

debian/patches/0740-use-packaged-modules.patch

@@ -62,7 +62,7 @@
  };
 --- a/package.json
 +++ b/package.json
-@@ -50,65 +50,36 @@
+@@ -50,65 +50,37 @@
      "apollo-link": "^1.2.11",
      "apollo-link-batch-http": "^1.2.11",
      "apollo-upload-client": "^10.0.0",
@@ -108,7 +108,7 @@
 -    "jquery": "^3.4.1",
 -    "jquery-ujs": "1.2.2",
      "jquery.caret": "^0.3.1",
--    "jquery.waitforimages": "^2.2.0",
+     "jquery.waitforimages": "^2.2.0",
 -    "js-cookie": "^2.1.3",
 -    "jszip": "^3.1.3",
 -    "jszip-utils": "^0.0.2",
@@ -128,7 +128,7 @@
      "raphael": "^2.2.7",
      "raw-loader": "^3.1.0",
      "sanitize-html": "^1.20.0",
-@@ -121,13 +92,9 @@
+@@ -121,13 +93,9 @@
      "svg4everybody": "2.1.9",
      "swagger-ui-dist": "^3.24.3",
      "three": "^0.84.0",
@@ -142,7 +142,7 @@
      "url-loader": "^2.1.0",
      "visibilityjs": "^1.2.4",
      "vue": "^2.6.10",
-@@ -137,13 +104,7 @@
+@@ -137,13 +105,7 @@
      "vue-template-compiler": "^2.6.10",
      "vue-virtual-scroll-list": "^1.4.4",
      "vuedraggable": "^2.23.0",

debian/patches/0790-protobuf-compat.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 2/2] Fix protobuf compatibility (Thanks to Stan Hu)
 
 --- a/lib/api/helpers/internal_helpers.rb
 +++ b/lib/api/helpers/internal_helpers.rb
-@@ -142,7 +142,7 @@
+@@ -110,7 +110,7 @@
          return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action)
  
          {

debian/rake-tasks.sh

@@ -41,5 +41,11 @@ runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake gettext:po_to_json
 echo "Precompiling assets..."
 runuser -u ${gitlab_user} -- sh -c '/usr/bin/bundle exec rake tmp:cache:clear assets:precompile'
 
+# Workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/213245
+echo "Adding symbolic link for assets/select2.png..."
+runuser -u ${gitlab_user} -- sh -c 'cd /usr/share/gitlab/public/assets && \
+	if ! [ -f select2.png ]; then \
+	ln -s select2-d6b5d8d83dbc18fb8d77c8761d331cd9e5123c9684950bab0406e98a24ac5ae8.png select2.png; fi'
+
 echo "Webpacking..."
 runuser -u ${gitlab_user} -- sh -c 'webpack --config config/webpack.config.js'