Merge tag 'debian/15.7.8+ds1-11' into bullseye-fasttrack

gitlab Debian release 15.7.8+ds1-11

debian/changelog

@@ -1,3 +1,18 @@
+gitlab (15.7.8+ds1-11) experimental; urgency=medium
+
+  * Drop obsolete config/feature_flags/development/gitaly_catfile-cache.yml
+  * Lock mermaid node module to 9.1.6 version for bullseye nodejs
+
+ -- Pirate Praveen <praveen@debian.org>  Mon, 13 Mar 2023 17:18:41 +0530
+
+gitlab (15.7.8+ds1-10) experimental; urgency=medium
+
+  * Update minimum version of ruby-grape to 1.7~ (fixes db:migrate)
+  * Use @rails/actioncable from npmjs.com (not from the archive).
+    This fixes infinite spinning circle in project display on web ui.
+
+ -- Pirate Praveen <praveen@debian.org>  Mon, 13 Mar 2023 00:32:10 +0530
+
 gitlab (15.7.8+ds1-9~fto11+1) bullseye-fasttrack; urgency=medium
 
   * Rebuild for bullseye-fasttrack.

debian/control

@@ -173,7 +173,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
    ruby-ntlm (>= 0.6.1~),
  ruby-net-ldap (>= 0.17~),
 # API
- ruby-grape (>= 1.5.1~),
+ ruby-grape (>= 1.7~),
  ruby-grape-entity (>= 0.10~),
  ruby-rack-cors (>= 1.0.6~),
 # GraphQL API

debian/gitlab.maintscript

@@ -1206,3 +1206,4 @@ rm_conffile /etc/gitlab/routes/repository_scoped.rb 15.5.4+ds1-1 gitlab
 rm_conffile /etc/gitlab/routes/sherlock.rb 15.5.4+ds1-1 gitlab
 rm_conffile /etc/gitlab/unicorn.rb.example 15.5.4+ds1-1 gitlab
 rm_conffile /etc/gitlab/unicorn.rb.example.development 15.5.4+ds1-1 gitlab
+rm_conffile /etc/gitlab/feature_flags/development/gitaly_catfile-cache.yml 15.7.8+ds1-10 gitlab

debian/gitlab.postinst

@@ -74,6 +74,7 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.0.12' "^arr-pm$" >
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.2.2 "^ipaddr$" >/dev/null; then gem install -v 1.2.2 ipaddr; fi"
 # Packaged version is probably buggy - task lists on issues broken
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.3.2 "^deckar01-task_list$" >/dev/null; then gem install -v 2.3.2 deckar01-task_list; fi"
+# We need this version to use newer googleauth
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.53.0 "^google-api-client$" >/dev/null; then gem install -v 0.53.0 google-api-client; fi"
 
 # Uninstall rack 3.x

debian/patches/nodejs/0040-use-packaged-modules.patch

@@ -94,12 +94,3 @@ Use debian packaged node modules when available
      "@codesandbox/sandpack-client": "^1.2.2",
      "@cubejs-client/core": "^0.31.0",
      "@gitlab/at.js": "1.5.7",
-@@ -60,7 +60,7 @@
-     "@gitlab/ui": "52.6.0",
-     "@gitlab/visual-review-tools": "1.7.3",
-     "@gitlab/web-ide": "0.0.1-dev-20221217175648",
--    "@rails/actioncable": "6.1.4-7",
-+    "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
-     "@rails/ujs": "6.1.4-7",
-     "@sourcegraph/code-host-integration": "0.0.84",
-     "@tiptap/core": "^2.0.0-beta.182",

debian/patches/nodejs/0080-use-matching-tiptap-core.patch

@@ -1,7 +1,7 @@
 --- a/package.json
 +++ b/package.json
 @@ -67,39 +67,39 @@
-     "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
+     "@rails/actioncable": "6.1.4-7",
      "@rails/ujs": "6.1.4-7",
      "@sourcegraph/code-host-integration": "0.0.84",
 -    "@tiptap/core": "^2.0.0-beta.182",

debian/patches/nodejs/0090-lock-mermaid-version.patch

@@ -0,0 +1,13 @@
+webpack fails with mermaid 9.4.3 on bullseye, and 9.1.6 is known to work
+
+--- a/package.json
++++ b/package.json
+@@ -151,7 +151,7 @@
+     "marked": "^4.0.18",
+     "mathjax": "3",
+     "mdurl": "^1.0.1",
+-    "mermaid": "^9.1.3",
++    "mermaid": "9.1.6",
+     "micromatch": "^4.0.5",
+     "minimatch": "^3.0.4",
+     "monaco-editor": "^0.30.1",

debian/patches/series

@@ -22,6 +22,7 @@ nodejs/0050-add-babel-plugins.patch
 nodejs/0060-use-system-yaml.patch
 nodejs/0070-use-system-katex.patch
 nodejs/0080-use-matching-tiptap-core.patch
+nodejs/0090-lock-mermaid-version.patch
 tweaks/0010-source-init-functions.patch
 tweaks/0020-fix-mail-room-path.patch
 tweaks/0030-fix-gitlab-yml-path.patch