From 1a3bb21202679ce7d0b0190295a3b04bd24ed99a Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Tue, 11 Jul 2023 23:39:55 +0530
Subject: [PATCH] Stop installing google-api-client in postinst

---
 debian/gitlab.postinst | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index c089adf61c..6eb3bf7023 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -78,8 +78,6 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.0.12' "^arr-pm$" >
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 0.6.1' "^omniauth_openid_connect$" >/dev/null; then gem install -v '~> 0.6.1' omniauth_openid_connect; fi"
 # Packaged version is probably buggy - task lists on issues broken
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.3.2 "^deckar01-task_list$" >/dev/null; then gem install -v 2.3.2 deckar01-task_list; fi"
-# We need this version to use newer googleauth
-runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.53.0 "^google-api-client$" >/dev/null; then gem install -v 0.53.0 google-api-client; fi"
 # We have a newer incompatible version in the archive
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 0.10.0 "^google-apis-core$" >/dev/null; then gem install -v 0.10.0 google-apis-core; fi"
 # archive has gitaly 16.0
@@ -88,11 +86,6 @@ runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~> 15.9.0.pre.rc3' "^gi
 # Uninstall rack 3.x
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v '~>3.0' "^rack$" >/dev/null; then gem uninstall -v '~>3.0' rack; fi"
 
-# Uninstall gitlab-labkit since it require jaeger-client '~> 1.1.0'
-if [ "$(gem which gitlab-labkit)" = "/var/lib/gitlab/.gem/gems/gitlab-labkit-0.29.0/lib/gitlab-labkit.rb" ]; then
-  runuser -u ${gitlab_user} -- sh -c "gem uninstall -v '~> 0.29.0' gitlab-labkit"
-fi
-
 # Gitlab needs this specific version due to
 # https://github.com/fog/fog-google/issues/421
 runuser -u ${gitlab_user} -- sh -c "if ! gem list -i -v 2.1.0 "^fog-core$" >/dev/null; then gem install -v 2.1.0 fog-core; fi"