Update grpc to v1.15.x in gitaly-ruby

3 files changed, 10 insertions, 30 deletions

diff --git a/changelogs/unreleased/grpc-update-1-15.yml b/changelogs/unreleased/grpc-update-1-15.yml
new file mode 100644
index 000000000..9ed3cfedb
--- /dev/null
+++ b/changelogs/unreleased/grpc-update-1-15.yml
@@ -0,0 +1,5 @@
+---
+title: Update grpc to v1.15.x in gitaly-ruby
+merge_request: 918
+author:
+type: other
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 4440a95b7..84d331966 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -11,7 +11,7 @@ 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 'grpc', '~> 1.15.0'
 gem 'sentry-raven', '~> 2.7.2', require: false
 gem 'faraday', '~> 0.12'
 
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index f9edb8cdf..132221f84 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -6,15 +6,13 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     charlock_holmes (0.7.6)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
     diff-lcs (1.3)
     escape_utils (1.2.1)
-    faraday (0.12.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
@@ -47,48 +45,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.15.0)
       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-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.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
     posix-spawn (0.3.13)
     powerpack (0.1.2)
-    public_suffix (3.0.2)
     rainbow (3.0.0)
     rdoc (4.3.0)
     rouge (3.2.1)
@@ -120,11 +100,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)
@@ -144,7 +119,7 @@ DEPENDENCIES
   gitlab-gollum-rugged_adapter (~> 0.4.4)
   gitlab-markup (~> 1.6.4)
   google-protobuf (= 3.5.1)
-  grpc (~> 1.11.0)
+  grpc (~> 1.15.0)
   licensee (~> 8.9.0)
   rdoc (~> 4.2)
   rspec