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

gitlab Debian release 15.7.8+ds1-6

debian/changelog

@@ -1,3 +1,16 @@
+gitlab (15.7.8+ds1-6) experimental; urgency=medium
+
+  * Start a sidekiq cluster instead of standalone (upstream now only supports
+    a cluster and gitlab:check fails without it) (Thanks to vv221)
+
+ -- Pirate Praveen <praveen@debian.org>  Wed, 08 Mar 2023 18:51:15 +0530
+
+gitlab (15.7.8+ds1-5) experimental; urgency=medium
+
+  * Update minimum versions of ruby-gpgme and ruby-doorkeeper-openid-connect
+
+ -- 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.

debian/gitlab.gitlab-sidekiq.service

@@ -11,12 +11,11 @@ ReloadPropagatedFrom=gitlab.service
 Type=simple
 WorkingDirectory=/usr/share/gitlab
 EnvironmentFile=/etc/gitlab/gitlab-debian.conf
+Environment=SIDEKIQ_QUEUES=*
 SyslogIdentifier=gitlab-sidekiq
 ExecStartPre=truncate -s 0 Gemfile.lock
 ExecStartPre=/usr/bin/bundle install --local --quiet
-ExecStart=/usr/bin/bundle exec sidekiq \
+ExecStart=/usr/bin/bundle exec bin/sidekiq-cluster $SIDEKIQ_QUEUES -e $RAILS_ENV
-    -C /etc/gitlab/sidekiq_queues.yml \
-    -e $RAILS_ENV
 Restart=on-abnormal
 
 ## No "Type=notify" support; wait for service to initialise: