Merge tag 'debian/15.9.8+ds1-3' into bullseye-fasttrack

gitlab Debian release 15.9.8+ds1-3

debian/changelog

@@ -1,12 +1,20 @@
-gitlab (15.9.8+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
+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 <praveen@debian.org>  Wed, 24 May 2023 19:04:16 +0530
+
+gitlab (15.9.8+ds1-2) experimental; urgency=medium
 
-  * Rebuild for bullseye-fasttrack.
   * 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 <praveen@debian.org>  Fri, 12 May 2023 19:02:11 +0530
+ -- Pirate Praveen <praveen@debian.org>  Tue, 23 May 2023 19:46:42 +0530
 
 gitlab (15.9.8+ds1-1) experimental; urgency=medium
 
@@ -37,12 +45,6 @@ gitlab (15.9.8+ds1-1) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Mon, 08 May 2023 21:52:06 +0530
 
-gitlab (15.8.5+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack
-
- -- Vinay Keshava <vinaykeshava@disroot.org>  Wed, 05 Apr 2023 01:36:56 +0530
-
 gitlab (15.8.5+ds1-1) experimental; urgency=medium
 
   * Install rack gem from rubygems.org in postinst
@@ -56,25 +58,6 @@ gitlab (15.8.5+ds1-1) experimental; urgency=medium
 
  -- Vinay Keshava <vinaykeshava@disroot.org>  Mon, 03 Apr 2023 14:16:49 +0530
 
-gitlab (15.8.4+ds1-1~fto11+3) bullseye-fasttrack; urgency=medium
-
-  * Update rack version for gem install to ~> 2.2.6
-  * Add epoch to ruby-google-protobuf version to force update
-
- -- Pirate Praveen <praveen@debian.org>  Fri, 24 Mar 2023 19:30:05 +0530
-
-gitlab (15.8.4+ds1-1~fto11+2) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Vinay Keshava <vinaykeshava@disroot.org>  Fri, 24 Mar 2023 10:09:14 +0530
-
-gitlab (15.8.4+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Vinay Keshava <vinaykeshava@disroot.org>  Sun, 19 Mar 2023 16:10:30 +0530
-
 gitlab (15.8.4+ds1-3) experimental; urgency=medium
 
   * Drop ruby-omniauth-shibboleth dependency (dropped in 15.9)
@@ -104,13 +87,6 @@ gitlab (15.8.4+ds1-1) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Sun, 19 Mar 2023 01:40:24 +0530
 
-gitlab (15.7.8+ds1-11~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-  * Update minimum version of ruby-grpc to 1.42~
-
- -- Pirate Praveen <praveen@debian.org>  Wed, 15 Mar 2023 18:00:28 +0530
-
 gitlab (15.7.8+ds1-11) experimental; urgency=medium
 
   * Drop obsolete config/feature_flags/development/gitaly_catfile-cache.yml
@@ -126,12 +102,6 @@ gitlab (15.7.8+ds1-10) experimental; urgency=medium
 
  -- 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.
-
- -- Pirate Praveen <praveen@debian.org>  Fri, 10 Mar 2023 22:07:55 +0530
-
 gitlab (15.7.8+ds1-9) experimental; urgency=medium
 
   * Install fog-core 2.1.0 using gem install in postinst (for fog-google)
@@ -139,36 +109,18 @@ gitlab (15.7.8+ds1-9) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Thu, 09 Mar 2023 23:59:37 +0530
 
-gitlab (15.7.8+ds1-8~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Thu, 09 Mar 2023 11:19:42 +0530
-
 gitlab (15.7.8+ds1-8) experimental; urgency=medium
 
   * Update minimum version of ruby-net-ldap to 0.17
 
  -- Pirate Praveen <praveen@debian.org>  Thu, 09 Mar 2023 10:55:41 +0530
 
-gitlab (15.7.8+ds1-7~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Wed, 08 Mar 2023 23:30:01 +0530
-
 gitlab (15.7.8+ds1-7) experimental; urgency=medium
 
   * Relax dependency on ruby-net-ldap
 
  -- Pirate Praveen <praveen@debian.org>  Wed, 08 Mar 2023 23:06:57 +0530
 
-gitlab (15.7.8+ds1-6~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Wed, 08 Mar 2023 19:03:55 +0530
-
 gitlab (15.7.8+ds1-6) experimental; urgency=medium
 
   * Start a sidekiq cluster instead of standalone (upstream now only supports
@@ -182,12 +134,6 @@ gitlab (15.7.8+ds1-5) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Tue, 07 Mar 2023 21:36:21 +0530
 
-gitlab (15.7.8+ds1-4~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Tue, 07 Mar 2023 16:09:55 +0530
-
 gitlab (15.7.8+ds1-4) experimental; urgency=medium
 
   * Remove rubygems.org version of gitlab-labkit
@@ -218,18 +164,6 @@ gitlab (15.7.8+ds1-1) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Sun, 05 Mar 2023 15:04:26 +0530
 
-gitlab (15.6.8+ds1-2~fto11+2) bullseye-fasttrack; urgency=medium
-
-  * Update minimum version of ruby-gitlab-sidekiq-fetcher to (>= 0.9~)
-
- -- Pirate Praveen <praveen@debian.org>  Sat, 04 Mar 2023 20:04:06 +0530
-
-gitlab (15.6.8+ds1-2~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Tue, 28 Feb 2023 19:53:11 +0530
-
 gitlab (15.6.8+ds1-2) experimental; urgency=medium
 
   * Add ruby-hashie >= 5.0 to Depends
@@ -239,13 +173,6 @@ gitlab (15.6.8+ds1-2) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Tue, 28 Feb 2023 17:23:21 +0530
 
-gitlab (15.6.8+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-  * Add ruby-hashie >= 5.0 to Depends
-
- -- Pirate Praveen <praveen@debian.org>  Mon, 27 Feb 2023 12:46:45 +0530
-
 gitlab (15.6.8+ds1-1) experimental; urgency=medium
 
   [ Mohammed Bilal ]
@@ -253,6 +180,7 @@ gitlab (15.6.8+ds1-1) experimental; urgency=medium
   * Update min versions
   * Add patch to relax oj in ipynbdiff
   * relax net-ldap version
+  * use matching versions of tiptap core and its extensions
 
   [ Pirate Praveen ]
   * New upstream version 15.6.8+ds1 (Fixes: CVE-2022-3411, CVE-2022-4138,
@@ -262,20 +190,6 @@ gitlab (15.6.8+ds1-1) experimental; urgency=medium
   * Update minimum versions of ruby-rails, ruby-telesign and
     ruby-net-http-persistent
 
- -- Mohammed Bilal <mdbilal@disroot.org>  Thu, 09 Feb 2023 15:39:14 +0530
-
-gitlab (15.6.6+ds1-2~fto11+2) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-  * use matching versions of tiptap core and its extensions
-
- -- Mohammed Bilal <mdbilal@disroot.org>  Thu, 09 Feb 2023 20:35:58 +0530
-
-gitlab (15.6.6+ds1-2~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-  * use matching versions of tiptap core and its extensions
-
  -- Pirate Praveen <praveen@debian.org>  Mon, 27 Feb 2023 11:05:00 +0530
 
 gitlab (15.6.6+ds1-2) experimental; urgency=medium
@@ -304,12 +218,6 @@ gitlab (15.6.6+ds1-1) experimental; urgency=medium
 
  -- Mohammed Bilal <mdbilal@disroot.org>  Sun, 22 Jan 2023 03:46:34 +0530
 
-gitlab (15.5.7+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Mohammed Bilal <mdbilal@disroot.org>  Tue, 10 Jan 2023 18:47:47 +0530
-
 gitlab (15.5.7+ds1-1) experimental; urgency=medium
 
   * Remove abandoned omniauth gems from depends
@@ -333,30 +241,12 @@ gitlab (15.5.4+ds3-3) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Mon, 12 Dec 2022 21:45:29 +0530
 
-gitlab (15.5.4+ds3-2~fto11+2) bullseye-fasttrack; urgency=medium
-
-  * Relax dependency on gitlab-labkit (to match gitaly)
-
- -- Pirate Praveen <praveen@debian.org>  Mon, 12 Dec 2022 20:04:16 +0530
-
-gitlab (15.5.4+ds3-2~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Mon, 12 Dec 2022 17:28:11 +0530
-
 gitlab (15.5.4+ds3-2) experimental; urgency=medium
 
   * Update minimum version of gitaly and ruby-gitaly to 15.5~
 
  -- Pirate Praveen <praveen@debian.org>  Mon, 12 Dec 2022 15:39:12 +0530
 
-gitlab (15.5.4+ds3-1~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Thu, 08 Dec 2022 23:41:46 +0530
-
 gitlab (15.5.4+ds3-1) experimental; urgency=medium
 
   * Update minimum version of puma and ruby-omniauth
@@ -373,25 +263,6 @@ gitlab (15.5.4+ds3-1) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Thu, 08 Dec 2022 16:48:03 +0530
 
-gitlab (15.4.2+ds1-1~fto11+3) bullseye-fasttrack; urgency=medium
-
-  * Restore using yaml from system for older nodejs compat
-    (created a separate patch so we don't miss this in future patch updates)
-
- -- Pirate Praveen <praveen@debian.org>  Thu, 27 Oct 2022 17:05:53 +0530
-
-gitlab (15.4.2+ds1-1~fto11+2) bullseye-fasttrack; urgency=medium
-
-  * Transpile some newer javascript with babel to run on bullseye's nodejs
-
- -- Pirate Praveen <praveen@debian.org>  Mon, 24 Oct 2022 20:16:22 +0530
-
-gitlab (15.4.2+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
-
-  * Rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Sat, 22 Oct 2022 16:58:12 +0530
-
 gitlab (15.4.2+ds1-1) experimental; urgency=medium
 
   * New upstream version 15.4.2+ds1
@@ -412,12 +283,6 @@ gitlab (15.3.4+ds1-1) experimental; urgency=medium
 
  -- Pirate Praveen <praveen@debian.org>  Sun, 02 Oct 2022 17:21:01 +0530
 
-gitlab (15.3.2+ds1-1~fto11+2) bullseye-fasttrack; urgency=medium
-
-  * Second rebuild for bullseye-fasttrack.
-
- -- Pirate Praveen <praveen@debian.org>  Thu, 15 Sep 2022 01:21:38 +0530
-
 gitlab (15.3.2+ds1-1) experimental; urgency=medium
 
   [ Mohammed Bilal ]

debian/control

@@ -107,6 +107,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~),

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