From d00da40e08ca8919810f1e3d82dc0f71393d0cff Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 2 Nov 2021 20:07:46 +0530 Subject: [PATCH 1/7] Use matching version of @tiptap/core in package.json --- debian/patches/0750-use-matching-tiptap-core.patch | 13 +++++++++++++ debian/patches/series | 1 + 2 files changed, 14 insertions(+) create mode 100644 debian/patches/0750-use-matching-tiptap-core.patch diff --git a/debian/patches/0750-use-matching-tiptap-core.patch b/debian/patches/0750-use-matching-tiptap-core.patch new file mode 100644 index 0000000000..912da485c8 --- /dev/null +++ b/debian/patches/0750-use-matching-tiptap-core.patch @@ -0,0 +1,13 @@ +Use matching version of @tiptap/core + +--- a/package.json ++++ b/package.json +@@ -65,7 +65,7 @@ + "@rails/ujs": "6.1.3-2", + "@sentry/browser": "5.26.0", + "@sourcegraph/code-host-integration": "0.0.59", +- "@tiptap/core": "^2.0.0-beta.86", ++ "@tiptap/core": "2.0.0-beta.86", + "@tiptap/extension-blockquote": "^2.0.0-beta.14", + "@tiptap/extension-bold": "^2.0.0-beta.14", + "@tiptap/extension-bullet-list": "^2.0.0-beta.14", diff --git a/debian/patches/series b/debian/patches/series index 9fca10a098..5f9496fe1a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,6 +24,7 @@ 0710-use-yarnpkg.patch 0740-use-packaged-modules.patch 0750-use-matching-monaco-editor-webpack-plugin.patch +0750-use-matching-tiptap-core.patch 0750-fix-relative-paths.patch 0770-remove-capybara-screenshot-rspec.patch 0800-search-binaries-in-path.patch From 17c126189280b6a3b88fa7789b38267e6742eff6 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 2 Nov 2021 22:17:58 +0530 Subject: [PATCH 2/7] Add a preinst script to check version of postgresql --- debian/gitlab.preinst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 debian/gitlab.preinst diff --git a/debian/gitlab.preinst b/debian/gitlab.preinst new file mode 100644 index 0000000000..a5eaf0a1a6 --- /dev/null +++ b/debian/gitlab.preinst @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +pg_version=$(pg_lsclusters |grep 5432 |awk '{print $1}') + +if [ "${pg_version}" -lt 12 ]; then + echo "========================================================================" + echo "Upgrade postgresql to at least version 12 before upgrading gitlab." + echo "You can use pg_upgradecluster command to upgrade the postgresql version." + echo "Aborting gitlab installation..." + echo "========================================================================" + exit 1 +fi From d35a28531634e99491633ae7ca397610d0f4f523 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 2 Nov 2021 21:45:35 +0530 Subject: [PATCH 3/7] Tighten some tiptap extension versions too in package.json --- .../0750-use-matching-tiptap-core.patch | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/debian/patches/0750-use-matching-tiptap-core.patch b/debian/patches/0750-use-matching-tiptap-core.patch index 912da485c8..9de81dcd40 100644 --- a/debian/patches/0750-use-matching-tiptap-core.patch +++ b/debian/patches/0750-use-matching-tiptap-core.patch @@ -1,13 +1,45 @@ -Use matching version of @tiptap/core +Use matching version of @tiptap/core and extentions --- a/package.json +++ b/package.json -@@ -65,7 +65,7 @@ +@@ -65,24 +65,24 @@ "@rails/ujs": "6.1.3-2", "@sentry/browser": "5.26.0", "@sourcegraph/code-host-integration": "0.0.59", - "@tiptap/core": "^2.0.0-beta.86", +- "@tiptap/extension-blockquote": "^2.0.0-beta.14", + "@tiptap/core": "2.0.0-beta.86", - "@tiptap/extension-blockquote": "^2.0.0-beta.14", ++ "@tiptap/extension-blockquote": "2.0.0-beta.14", "@tiptap/extension-bold": "^2.0.0-beta.14", - "@tiptap/extension-bullet-list": "^2.0.0-beta.14", +- "@tiptap/extension-bullet-list": "^2.0.0-beta.14", ++ "@tiptap/extension-bullet-list": "2.0.0-beta.14", + "@tiptap/extension-code": "^2.0.0-beta.14", + "@tiptap/extension-code-block-lowlight": "2.0.0-beta.32", + "@tiptap/extension-document": "^2.0.0-beta.12", + "@tiptap/extension-dropcursor": "^2.0.0-beta.17", + "@tiptap/extension-gapcursor": "^2.0.0-beta.18", + "@tiptap/extension-hard-break": "^2.0.0-beta.14", +- "@tiptap/extension-heading": "^2.0.0-beta.14", ++ "@tiptap/extension-heading": "2.0.0-beta.14", + "@tiptap/extension-history": "^2.0.0-beta.14", + "@tiptap/extension-horizontal-rule": "^2.0.0-beta.17", + "@tiptap/extension-image": "^2.0.0-beta.14", + "@tiptap/extension-italic": "^2.0.0-beta.14", + "@tiptap/extension-link": "^2.0.0-beta.18", + "@tiptap/extension-list-item": "^2.0.0-beta.13", +- "@tiptap/extension-ordered-list": "^2.0.0-beta.14", ++ "@tiptap/extension-ordered-list": "2.0.0-beta.14", + "@tiptap/extension-paragraph": "^2.0.0-beta.15", + "@tiptap/extension-strike": "^2.0.0-beta.16", + "@tiptap/extension-subscript": "^2.0.0-beta.4", +@@ -91,8 +91,8 @@ + "@tiptap/extension-table-cell": "^2.0.0-beta.13", + "@tiptap/extension-table-header": "^2.0.0-beta.15", + "@tiptap/extension-table-row": "^2.0.0-beta.13", +- "@tiptap/extension-task-item": "^2.0.0-beta.17", +- "@tiptap/extension-task-list": "^2.0.0-beta.17", ++ "@tiptap/extension-task-item": "2.0.0-beta.17", ++ "@tiptap/extension-task-list": "2.0.0-beta.17", + "@tiptap/extension-text": "^2.0.0-beta.12", + "@tiptap/vue-2": "^2.0.0-beta.39", + "@toast-ui/editor": "^2.5.2", From e1c21b132b7affc9bb10906827b9f67e64fb8559 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 4 Nov 2021 00:52:39 +0530 Subject: [PATCH 4/7] Upload to experimental --- debian/changelog | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90a48cbd9e..564df052be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gitlab (14.2.6+ds1-1) UNRELEASED; urgency=medium +gitlab (14.2.6+ds1-1) experimental; urgency=medium * New upstream version 14.2.5+ds1 * Refresh patches @@ -7,8 +7,17 @@ gitlab (14.2.6+ds1-1) UNRELEASED; urgency=medium * Fix XS-Go-Import-Path (remove extra workhorse from import path) * Rename workhorse binary to gitlab-workhorse * New upstream version 14.2.6+ds1 + * Update minimum versions of gitaly, ruby-gitaly and gitlab-common + * Relax dependency on rails in Gemfile + * Update dependencies + * Remove obsolete maintscript + * Force specific version of monaco-editor-webpack-plugin for compatibility + * Update minimum version of ruby-unleash + * Use matching version of @tiptap/core in package.json + * Add a preinst script to check version of postgresql + * Tighten some tiptap extension versions too in package.json - -- Pirate Praveen Fri, 29 Oct 2021 22:02:11 +0530 + -- Pirate Praveen Thu, 04 Nov 2021 00:51:54 +0530 gitlab (14.1.7+ds1-2) experimental; urgency=medium From fef750d687c0e27ba93a2255008e912e647f1ece Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 4 Nov 2021 02:01:51 +0530 Subject: [PATCH 5/7] Switch to bash for quotes support in arguments for gitlab-rake --- debian/gitlab-rake.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/gitlab-rake.sh b/debian/gitlab-rake.sh index a6a8b1bf52..dda61b5cd9 100755 --- a/debian/gitlab-rake.sh +++ b/debian/gitlab-rake.sh @@ -1,5 +1,5 @@ -#! /bin/sh - +#! /bin/bash +# Using bash for ${variable@Q} option for passing quotes from command line argument to rake set -e # Read debian specific configuration @@ -9,6 +9,4 @@ export DB RAILS_ENV cd /usr/share/gitlab -# Check gitlab is configured correctly -printf "Check if Gitlab is configured correctly...\n" -runuser -u ${gitlab_user} -- sh -c "/usr/bin/bundle exec rake $@" +runuser -u ${gitlab_user} -- sh -c "/usr/bin/bundle exec rake ${@@Q}" From f80f671f78f46d96cc0db4893852c2efe767882d Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 4 Nov 2021 02:02:45 +0530 Subject: [PATCH 6/7] Update prior-version in maintscript for rm_conffile --- debian/maintscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/maintscript b/debian/maintscript index 6571363788..eef1c4c7cd 100644 --- a/debian/maintscript +++ b/debian/maintscript @@ -313,4 +313,4 @@ rm_conffile /etc/gitlab/initializers/puma_client_tempfile_patch.rb 13.10.4+ds1-1 rm_conffile /etc/gitlab/initializers/action_dispatch_journey_formatter.rb 13.12.9+ds1-3 gitlab rm_conffile /etc/gitlab/initializers/labkit_middleware.rb 13.12.9+ds1-3 gitlab rm_conffile /etc/gitlab/initializers/mailer_retries.rb 13.12.9+ds1-3 gitlab -rm_conffile /etc/gitlab/initializers/transaction_metrics.rb 14.1.7+ds1-2 gitlab +rm_conffile /etc/gitlab/initializers/transaction_metrics.rb 14.1.7+ds1-2~ gitlab From f9cc17078595ddcb5cd4a38fe8ab3f2f1fb04a9a Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 4 Nov 2021 02:03:17 +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 564df052be..0e1d17596f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (14.2.6+ds1-2) experimental; urgency=medium + + * Switch to bash for quotes support in arguments for gitlab-rake + * Update prior-version in maintscript for rm_conffile + + -- Pirate Praveen Thu, 04 Nov 2021 02:03:07 +0530 + gitlab (14.2.6+ds1-1) experimental; urgency=medium * New upstream version 14.2.5+ds1