From 6b7ef95e3879f5b8d429378377f63e4477a2e00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Mon, 15 Oct 2018 01:09:27 -0300
Subject: [PATCH] Use grpc v1.15.x
---
Gemfile | 2 +-
Gemfile.lock | 22 ++++++++--------------
Gemfile.rails5.lock | 22 ++++++++--------------
3 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/Gemfile b/Gemfile
index ef14aace277eb..ed6bba2abfc99 100644
--- a/Gemfile
+++ b/Gemfile
@@ -436,7 +436,7 @@ end
# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.118.1', require: 'gitaly'
-gem 'grpc', '~> 1.11.0'
+gem 'grpc', '~> 1.15.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed
gem 'google-protobuf', '= 3.5.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index dee77927d2986..07bb8a684b6e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -353,15 +353,14 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
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)
+ googleauth (0.6.6)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
- logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
- os (~> 0.9)
+ os (>= 0.9, < 2.0)
signet (~> 0.7)
gpgme (2.0.13)
mini_portile2 (~> 2.1)
@@ -385,10 +384,9 @@ GEM
railties
sprockets-rails
graphql (1.8.1)
- 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)
gssapi (1.2.0)
ffi (>= 1.0.1)
haml (5.0.4)
@@ -493,11 +491,7 @@ GEM
xml-simple
licensee (8.9.2)
rugged (~> 0.24)
- little-plugger (1.1.4)
locale (2.1.2)
- logging (2.2.2)
- little-plugger (~> 1.1)
- multi_json (~> 1.10)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
@@ -604,7 +598,7 @@ GEM
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
- os (0.9.6)
+ os (1.0.0)
parallel (1.12.1)
parser (2.5.1.0)
ast (~> 2.4.0)
@@ -872,7 +866,7 @@ GEM
sidekiq-cron (0.6.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
- signet (0.8.1)
+ signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
@@ -1081,7 +1075,7 @@ DEPENDENCIES
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
- grpc (~> 1.11.0)
+ grpc (~> 1.15.0)
gssapi
haml_lint (~> 0.26.0)
hamlit (~> 2.8.8)
@@ -1224,4 +1218,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.16.4
+ 1.16.6
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index d259cf46c9bd8..fcfadde12b8fd 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -356,15 +356,14 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
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)
+ googleauth (0.6.6)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
- logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
- os (~> 0.9)
+ os (>= 0.9, < 2.0)
signet (~> 0.7)
gpgme (2.0.13)
mini_portile2 (~> 2.1)
@@ -388,10 +387,9 @@ GEM
railties
sprockets-rails
graphql (1.8.1)
- 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)
gssapi (1.2.0)
ffi (>= 1.0.1)
haml (5.0.4)
@@ -496,11 +494,7 @@ GEM
xml-simple
licensee (8.9.2)
rugged (~> 0.24)
- little-plugger (1.1.4)
locale (2.1.2)
- logging (2.2.2)
- little-plugger (~> 1.1)
- multi_json (~> 1.10)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
@@ -608,7 +602,7 @@ GEM
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
- os (0.9.6)
+ os (1.0.0)
parallel (1.12.1)
parser (2.5.1.0)
ast (~> 2.4.0)
@@ -880,7 +874,7 @@ GEM
sidekiq-cron (0.6.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
- signet (0.8.1)
+ signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
@@ -1090,7 +1084,7 @@ DEPENDENCIES
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
- grpc (~> 1.11.0)
+ grpc (~> 1.15.0)
gssapi
haml_lint (~> 0.26.0)
hamlit (~> 2.8.8)
@@ -1233,4 +1227,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.16.4
+ 1.16.6
--
GitLab