From 54839806c46e6bd800cf4353ad1efbd64f870ec4 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sat, 11 Mar 2023 17:59:15 +0530 Subject: [PATCH 1/7] Update minimum version of ruby-grape to 1.7~ --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7c4f192c50..474d61d308 100644 --- a/debian/control +++ b/debian/control @@ -169,7 +169,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 From bf09d4c020f070a878138a1db2a297d23cfccc53 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 13 Mar 2023 00:31:33 +0530 Subject: [PATCH 2/7] Use @rails/actioncable from npmjs.com (not from the archive) --- debian/patches/nodejs/0040-use-packaged-modules.patch | 9 --------- .../patches/nodejs/0080-use-matching-tiptap-core.patch | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch index 89a403f357..1eed922d2c 100644 --- a/debian/patches/nodejs/0040-use-packaged-modules.patch +++ b/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", diff --git a/debian/patches/nodejs/0080-use-matching-tiptap-core.patch b/debian/patches/nodejs/0080-use-matching-tiptap-core.patch index e0ab8a4ea3..5f71cda98b 100644 --- a/debian/patches/nodejs/0080-use-matching-tiptap-core.patch +++ b/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", From 3fe89fef8b37552822348c6e413ae4b4358fc4bc Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 13 Mar 2023 00:33:04 +0530 Subject: [PATCH 3/7] Upload to experimental --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2c0fa744be..48cbdb3b0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 Mon, 13 Mar 2023 00:32:10 +0530 + gitlab (15.7.8+ds1-9) experimental; urgency=medium * Install fog-core 2.1.0 using gem install in postinst (for fog-google) From 3f7d936709c1edae04671a37d1334646a32c94e6 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 13 Mar 2023 17:24:09 +0530 Subject: [PATCH 4/7] Drop obsolete config/feature_flags/development/gitaly_catfile-cache.yml --- debian/gitlab.maintscript | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/gitlab.maintscript b/debian/gitlab.maintscript index 2d47b12864..b5b3b810a9 100644 --- a/debian/gitlab.maintscript +++ b/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 From 3458f0483f895e6f6c9433deae5e2f7e9e75161f Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 13 Mar 2023 22:08:52 +0530 Subject: [PATCH 5/7] Lock mermaid node module to 9.1.6 version for bullseye nodejs --- .../patches/nodejs/0090-lock-mermaid-version.patch | 13 +++++++++++++ debian/patches/series | 1 + 2 files changed, 14 insertions(+) create mode 100644 debian/patches/nodejs/0090-lock-mermaid-version.patch diff --git a/debian/patches/nodejs/0090-lock-mermaid-version.patch b/debian/patches/nodejs/0090-lock-mermaid-version.patch new file mode 100644 index 0000000000..092dd517a4 --- /dev/null +++ b/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", diff --git a/debian/patches/series b/debian/patches/series index 47cdc30703..fa0046505f 100644 --- a/debian/patches/series +++ b/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 From e8cf06222cd977b9c3c2ef5132a7ba1a4460fc8f Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 13 Mar 2023 23:24:20 +0530 Subject: [PATCH 6/7] Add comment about google-api-client --- debian/gitlab.postinst | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst index 1ababdad04..8668c2de0f 100755 --- a/debian/gitlab.postinst +++ b/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 From da40a43ad0247f92418519b99af83c5689d3be45 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 13 Mar 2023 17:18:54 +0530 Subject: [PATCH 7/7] Upload to experimental --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 48cbdb3b0d..e202fb1520 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 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)