From d6c246ac637a9206ecaa9f5e6c81c0beb5a8d0a2 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Tue, 10 Aug 2021 21:07:34 +0530
Subject: [PATCH] Switch back to using ruby-grpc package

---
 debian/control         | 3 +--
 debian/gitlab.postinst | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index b6732ebabd..293096f840 100644
--- a/debian/control
+++ b/debian/control
@@ -383,8 +383,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-spamcheck,
 # Gitaly GRPC client
  ruby-gitaly (>= 13.12~),
-# See #966653
-# ruby-grpc (>= 1.30.2~),
+ ruby-grpc (>= 1.30.2~),
  ruby-google-protobuf (>= 3.17.3-1.1~),
 #
  ruby-toml-rb (>= 1.0.0-2~),
diff --git a/debian/gitlab.postinst b/debian/gitlab.postinst
index 042075b31d..619856b7b5 100755
--- a/debian/gitlab.postinst
+++ b/debian/gitlab.postinst
@@ -37,11 +37,6 @@ test -f ${gitlab_common_defaults} && . ${gitlab_common_defaults}
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
-# These gems should be installed as root for gitlab to find it
-# Setting GEM_HOME seems not working for all cases, help welcome to fix it
-# Workaround for #966653
-/usr/bin/gem install -v 1.30.2 grpc
-
 #######################################################################
 # Read debian specific configuration
 #######################################################################