Bump gRPC gem through gitaly-protozj-update-grpc

Potentially this solves https://gitlab.com/gitlab-org/gitlab-ce/issues/50965
although we're not sure.

Side effect of this change is that we're only depending on gitaly-proto
to set the gRPC version for its gem. This makes it easier to keep these
in sync.

3 files changed, 8 insertions, 30 deletions

diff --git a/changelogs/unreleased/zj-update-grpc.yml b/changelogs/unreleased/zj-update-grpc.yml
new file mode 100644
index 000000000..b051742c1
--- /dev/null
+++ b/changelogs/unreleased/zj-update-grpc.yml
@@ -0,0 +1,5 @@
+---
+title: Bump gRPC gem through gitaly-proto
+merge_request: 877
+author:
+type: other
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 2b752992f..984fe4f9c 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -8,7 +8,6 @@ gem 'activesupport', '~> 5.0.2'
 gem 'rdoc', '~> 4.2'
 gem 'gitlab-gollum-lib', '~> 4.2', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
-gem 'grpc', '~> 1.11.0'
 gem 'sentry-raven', '~> 2.7.2', require: false
 gem 'faraday', '~> 0.12'
 
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index d76ba86c3..7aae81dec 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -6,8 +6,6 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     charlock_holmes (0.7.6)
     concurrent-ruby (1.0.5)
@@ -51,48 +49,30 @@ GEM
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
     google-protobuf (3.5.1)
-    googleapis-common-protos-types (1.0.1)
+    googleapis-common-protos-types (1.0.2)
       google-protobuf (~> 3.0)
-    googleauth (0.6.2)
-      faraday (~> 0.12)
-      jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
-    grpc (1.11.0)
+    grpc (1.14.1)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
-      googleauth (>= 0.5.1, < 0.7)
     i18n (0.8.1)
     json (2.1.0)
-    jwt (2.1.0)
     licensee (8.9.2)
       rugged (~> 0.24)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    memoist (0.16.0)
-    mime-types (3.2.2)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     minitest (5.9.1)
-    multi_json (1.13.1)
     multipart-post (2.0.0)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
       nokogiri
-    os (0.9.6)
     parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     posix-spawn (0.3.13)
     powerpack (0.1.1)
-    public_suffix (3.0.2)
     rainbow (2.2.2)
       rake
     rake (12.1.0)
@@ -130,11 +110,6 @@ GEM
       nokogumbo (~> 1.4)
     sentry-raven (2.7.2)
       faraday (>= 0.7.6, < 1.0)
-    signet (0.8.1)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
     stringex (2.8.4)
     thread_safe (0.3.6)
     tzinfo (1.2.2)
@@ -154,7 +129,6 @@ DEPENDENCIES
   gitlab-markup (~> 1.6.4)
   gitlab-styles (~> 2.0.0)
   google-protobuf (= 3.5.1)
-  grpc (~> 1.11.0)
   licensee (~> 8.9.0)
   rdoc (~> 4.2)
   rspec