From c4a7db34d28987d8946f365e91d29eaf71b1f543 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Mon, 27 Feb 2023 21:02:17 +0530
Subject: [PATCH] Use ruby-sidekiq and ruby-asciidoctor-kroki from archive

---
 debian/control         | 6 +++---
 debian/gitlab.postinst | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index cc31e65127..d6750ffd84 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-bootsnap (>= 1.13~),
  ruby-responders (>= 3.0~),
  ruby-sprockets (>= 3.7~),
- ruby-view-component (>= 2.74~),
+ ruby-view-component (>= 2.74.1~),
  ruby-default-value-for (>= 3.4~),
 #ruby-mysql2 | ruby-pg,
  ruby-pg (>= 1.4.3~),
@@ -231,7 +231,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  asciidoctor (>= 2.0.17~),
  ruby-asciidoctor-include-ext (>= 0.4~),
  ruby-asciidoctor-plantuml (>= 0.0.16~),
- ruby-asciidoctor-kroki (>= 0.5~),
+ ruby-asciidoctor-kroki (>= 0.7~),
  ruby-rouge (>= 3.29~),
  ruby-truncato (>= 0.7.12~),
  ruby-bootstrap-form (>= 4.2~),
@@ -254,7 +254,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Issue tags
  ruby-acts-as-taggable-on (>= 9.0~),
 # Background jobs
- ruby-sidekiq (>= 6.4~),
+ ruby-sidekiq (>= 6.5.7~),
  ruby-sidekiq-cron (>= 1.8~),
  ruby-redis-namespace (>= 1.8.1~),
  ruby-gitlab-sidekiq-fetcher (>= 0.8~),
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index 45f7b125d4..2e35a3de7d 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -83,8 +83,6 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.14' "^google-apis-
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.13' "^google-apis-sqladmin_v1beta4$" >/dev/null; then gem install -v '~> 0.13' google-apis-sqladmin_v1beta4; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.7' "^google-apis-pubsub_v1$" >/dev/null; then gem install -v '~> 0.7' google-apis-pubsub_v1; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.4.0' "^gitlab-fog-azure-rm$" >/dev/null; then gem install -v '~> 1.4.0' gitlab-fog-azure-rm; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '6.5.7' "^sidekiq$" >/dev/null; then gem install -v '6.5.7' sidekiq; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.7.0' "^asciidoctor-kroki$" >/dev/null; then gem install -v '~> 0.7.0' asciidoctor-kroki; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 2.0.0' "^invisible_captcha$" >/dev/null; then gem install -v '~> 2.0.0' invisible_captcha; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 5.3.1' "^browser$" >/dev/null; then gem install -v '~> 5.3.1' browser; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.0' "^memory_profiler$" >/dev/null; then gem install -v '~> 1.0' memory_profiler; fi"