From 809e4b556e574a5ffbaa3fcec46ad45c7cda41f4 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sun, 28 Aug 2022 22:07:49 +0530
Subject: [PATCH] Update minimum versions and install unsatisfied gems from
 rubygems.org

---
 debian/control         | 22 +++++++++++-----------
 debian/gitlab.postinst |  7 ++++++-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 8f58c7ae7b..0511d239ba 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Build-Depends: debhelper-compat (= 13),
                golang-github-sebest-xff-dev,
                golang-github-sirupsen-logrus-dev,
                golang-github-stretchr-testify-dev (>= 1.4~),
-               golang-gitlab-gitlab-org-gitaly-dev (>= 15.2~),
+               golang-gitlab-gitlab-org-gitaly-dev (>= 15.3~),
                  golang-github-beevik-ntp-dev,
                golang-gitlab-gitlab-org-labkit-dev (>= 1.14~),
                golang-gocloud-dev,
@@ -90,17 +90,17 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  bzip2,
  ucf,
  gitlab-workhorse (>= ${source:Version}),
- ruby-rails (>= 2:6.1.4.7~),
+ ruby-rails (>= 2:6.1.6.1~),
    ruby-websocket-extensions (>= 0.1.5~),
- ruby-bootsnap (>= 1.12~),
+ ruby-bootsnap (>= 1.13~),
  ruby-responders (>= 3.0~),
  ruby-sprockets (>= 3.7~),
- ruby-view-component (>= 2.50~),
+ ruby-view-component (>= 2.61~),
  ruby-default-value-for (>= 3.4~),
 #ruby-mysql2 | ruby-pg,
  ruby-pg (>= 1.3~),
  ruby-rugged (>= 1.2~),
- ruby-grape-path-helpers (>= 1.7~),
+ ruby-grape-path-helpers (>= 1.7.1~),
  ruby-faraday (>= 1.0~),
  ruby-marginalia (>= 1.10~),
 # Authorization
@@ -225,7 +225,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-asciidoctor-plantuml (>= 0.0.12~),
  ruby-asciidoctor-kroki (>= 0.5~),
  ruby-rouge (>= 3.29~),
- ruby-truncato (>= 0.7.11~),
+ ruby-truncato (>= 0.7.12~),
  ruby-bootstrap-form (>= 4.2~),
  ruby-nokogiri (>= 1.13.6~),
  ruby-escape-utils (>= 1.2.1~),
@@ -291,7 +291,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # FogBugz integration
  ruby-fogbugz (>= 0.2.1-3~),
 # Kubernetes integration
- ruby-kubeclient (>= 4.9.2~),
+ ruby-kubeclient (>= 4.9.3~),
    ruby-recursive-open-struct (>= 1.1.1~),
    ruby-http (>= 4.4~),
 # Sanitize user input
@@ -349,7 +349,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # I18n
  ruby-ruby-parser (>= 3.15~),
  ruby-whitequark-parser (>= 3.0~),
- ruby-rails-i18n (>= 6.0~),
+ ruby-rails-i18n (>= 7.0~),
  ruby-gettext-i18n-rails (>= 1.8~),
  ruby-gettext-i18n-rails-js (>= 1.3~),
    ruby-gettext (>= 3.3.3~),
@@ -397,7 +397,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Spamcheck GRPC protocol definitions
  ruby-spamcheck,
 # Gitaly GRPC client
- ruby-gitaly (>= 15.2~),
+ ruby-gitaly (>= 15.3~),
 # KAS GRPC protocol definitions
  ruby-kas-grpc,
 #
@@ -434,7 +434,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-json-schemer (>= 0.2.12~),
  ruby-oj (>= 3.13.19~),
  ruby-multi-json (>= 1.14.1~),
- ruby-yajl (>= 1.4.1~),
+ ruby-yajl (>= 1.4.3~),
  ruby-webauthn (>= 2.5~),
  ruby-parslet,
  ruby-ipynbdiff (>= 0.4.7~),
@@ -523,7 +523,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # gitlab-sidekiq was failing without puma
  puma
 Recommends: certbot,
- gitaly (>= 15.2~),
+ gitaly (>= 15.3~),
  openssh-server
 Conflicts: libruby2.5
 Description: git powered software platform to collaborate on code (non-omnibus)
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index 0b470f5223..021e61b0bb 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -74,8 +74,13 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 7.2 "^elasticsearch-rail
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 6.6 "^rack-attack$" >/dev/null; then gem install -v 6.6 rack-attack; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 3.131 "^aws-sdk-core$" >/dev/null; then gem install -v 3.131 aws-sdk-core; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 1.114 "^aws-sdk-s3$" >/dev/null; then gem install -v 1.114 aws-sdk-s3; fi"
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 7.0' "^rails-i18n$" >/dev/null; then gem install -v '~> 7.0' rails-i18n; fi"
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 2.0' "^oauth2$" >/dev/null; then gem install -v '~> 2.0' oauth2; fi"
+runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 1.21.2' "^rack-oauth2$" >/dev/null; then gem install -v '~> 1.21.2' rack-oauth2; fi"
+runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 5.3' "^redis-actionpack$" >/dev/null; then gem install -v '~> 5.3' redis-actionpack; fi"
+runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.24' "^gitlab-labkit$" >/dev/null; then gem install -v '~> 0.24' gitlab-labkit; fi"
+runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.25' "^flipper$" >/dev/null; then gem install -v '~> 0.25' flipper; fi"
+runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.25' "^flipper-active_record$" >/dev/null; then gem install -v '~> 0.25' flipper-active_record; fi"
+runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.25' "^flipper-active_support_cache_store$" >/dev/null; then gem install -v '~> 0.25' flipper-active_support_cache_store; fi"
 
 #######################################################################
 # update Gemfile.lock and yarn.lock, always