From 7f353826fdc2ec4397f46070357a51a2ea944a86 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 15 May 2023 22:27:03 +0530 Subject: [PATCH 1/8] Add ruby-digest-crc to dependency --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index d0816a7743..dad7f130fb 100644 --- a/debian/control +++ b/debian/control @@ -463,6 +463,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # for ruby 3.1 ruby-net-http-persistent (>= 4.0~), ruby-telesignenterprise, +# for google-cloud-storage + ruby-digest-crc, # packaged node modules - all node packages are not packaged yet node-rails-actioncable, node-autosize (>= 4.0.2~dfsg1-5~), From a0854947d69c4c19505af19dccc8b34d60520559 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Mon, 15 May 2023 22:37:21 +0530 Subject: [PATCH 2/8] Add ruby-google-apis-container-v1 as dependency --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index dad7f130fb..589b8b05ff 100644 --- a/debian/control +++ b/debian/control @@ -204,6 +204,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-google-apis-compute-v1 (>= 0.57~), ruby-google-apis-compute-v1 (>= 0.43~), ruby-google-apis-container-v1beta1 (>= 0.43~), + ruby-google-apis-container-v1 (>= 0.43~), ruby-google-apis-cloudbilling-v1 (>= 0.21~), ruby-google-apis-cloudresourcemanager-v1 (>= 0.31~), ruby-google-apis-iam-v1 (>= 0.36~), From 30051702d928894704906804ce54d75f2338f019 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 16 May 2023 01:08:40 +0530 Subject: [PATCH 3/8] Update minimum version of ruby-gitlab-markup to 1.9~ --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 589b8b05ff..3e8dfc62cf 100644 --- a/debian/control +++ b/debian/control @@ -228,7 +228,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # Markdown and HTML processing ruby-html-pipeline (>= 2.14.3~), ruby-task-list (>= 2.3.1~), - ruby-gitlab-markup, + ruby-gitlab-markup (>= 1.9~), ruby-github-markup (>= 1.7~), ruby-commonmarker (>= 0.23.6~), ruby-kramdown (>= 2.3.1~), From b80a813e47ce6bcdd8a981112c6124b40a8ab7f3 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 16 May 2023 01:43:00 +0530 Subject: [PATCH 4/8] Update minimum version of ruby-json to 2.6.3 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 3e8dfc62cf..afaddd7003 100644 --- a/debian/control +++ b/debian/control @@ -444,7 +444,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # Email validation ruby-valid-email, # JSON - ruby-json (>= 2.5.1~), + ruby-json (>= 2.6.3~), ruby-json-schema (>= 2.8.1-2~), ruby-json-schemer (>= 0.2.12~), ruby-oj (>= 3.14.1-2~), From eae9439ec75560412ccf40f9216eaa219926436f Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 23 May 2023 19:45:57 +0530 Subject: [PATCH 5/8] Remove more obsolete initializers --- debian/gitlab.maintscript | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/gitlab.maintscript b/debian/gitlab.maintscript index ad095b2dac..e7e36451f4 100644 --- a/debian/gitlab.maintscript +++ b/debian/gitlab.maintscript @@ -1212,3 +1212,7 @@ rm_conffile /etc/gitlab/feature_flags/development/projects_build_artifacts_size_ rm_conffile /etc/gitlab/feature_flags/development/ci_register_job_temporary_lock.yml 15.8.5+ds1-1 gitlab rm_conffile /etc/gitlab/initializers/bootstrap_form.rb 15.8.5+ds1-1 gitlab rm_conffile /etc/gitlab/initializers/google_api_client_patch.rb 15.8.5+ds1-1 gitlab +rm_conffile /etc/gitlab/initializers/types.rb 15.9.8+ds1-1 gitlab +rm_conffile /etc/gitlab/initializers/active_record_data_types.rb 15.9.8+ds1-1 gitlab +rm_conffile /etc/gitlab/initializers/9_fast_gettext.rb 15.9.8+ds1-1 gitlab +rm_conffile /etc/gitlab/initializers/0_log_deprecations.rb 15.9.8+ds1-1 gitlab From c5ad9b7818c4602ab7534a35fd48b7b36869eec8 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 23 May 2023 19:47:09 +0530 Subject: [PATCH 6/8] Upload to experimental --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index a9f14ea416..95adea32d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gitlab (15.9.8+ds1-2) experimental; urgency=medium + + * Add ruby-digest-crc to dependency + * Add ruby-google-apis-container-v1 as dependency + * Update minimum version of ruby-gitlab-markup to 1.9~ + * Update minimum version of ruby-json to 2.6.3 + * Remove more obsolete initializers + + -- Pirate Praveen Tue, 23 May 2023 19:46:42 +0530 + gitlab (15.9.8+ds1-1) experimental; urgency=medium [ Vinay Keshava ] From 8ed4c9e59127e0da2e42e9e357c87890a20bdf33 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 24 May 2023 19:03:53 +0530 Subject: [PATCH 7/8] Update minimum version of ruby-zeitwerk to 2.6.1~ --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index afaddd7003..7ce3dbd7dc 100644 --- a/debian/control +++ b/debian/control @@ -103,6 +103,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, gitlab-workhorse (>= ${source:Version}), ruby-rails (>= 2:6.1.7.2~), ruby-websocket-extensions (>= 0.1.5~), + ruby-zeitwerk (>= 2.6.1~), ruby-bootsnap (>= 1.15~), ruby-responders (>= 3.0~), ruby-sprockets (>= 3.7~), From 71bc568de3453c3da71ae86faaf96f4abcdb85ce Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 24 May 2023 19:05:52 +0530 Subject: [PATCH 8/8] Upload to experimental --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 95adea32d1..aae8c8e709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gitlab (15.9.8+ds1-3) experimental; urgency=medium + + * Update minimum version of ruby-zeitwerk to 2.6.1~ (this fixes gitlab-puma + service failing to start with uninitialized constant Tasks::Gitlab + (NameError)) + + -- Pirate Praveen Wed, 24 May 2023 19:04:16 +0530 + gitlab (15.9.8+ds1-2) experimental; urgency=medium * Add ruby-digest-crc to dependency