Merge tag 'debian/13.12.9+ds1-2' into bullseye-fasttrack

debian/changelog

@@ -1,3 +1,9 @@
+gitlab (13.12.9+ds1-2) experimental; urgency=medium
+
+  * Switch back to using packaged ruby-google-protobuf (see #992008)
+
+ -- Pirate Praveen <praveen@debian.org>  Tue, 10 Aug 2021 01:05:43 +0530
+
 gitlab (13.12.9+ds1-1~fto11+1) bullseye-fasttrack; urgency=medium
 
   * Rebuild for bullseye-fasttrack.

debian/control

@@ -385,7 +385,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-gitaly (>= 13.12~),
 # See #966653
 # ruby-grpc (>= 1.30.2~),
-# ruby-google-protobuf (>= 3.14~),
+ ruby-google-protobuf (>= 3.17.3-1.1~),
 #
  ruby-toml-rb (>= 1.0.0-2~),
 # Feature toggles

debian/gitlab.postinst

@@ -41,8 +41,6 @@ test -f ${gitlab_common_defaults} && . ${gitlab_common_defaults}
 # 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
-# Workaround for #989774
-/usr/bin/gem install -v 3.17.1 google-protobuf
 
 #######################################################################
 # Read debian specific configuration