summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-04-24 12:12:23 +0000
committerNick Thomas <nick@gitlab.com>2019-04-24 12:12:23 +0000
commitb458b4158019013e468e9478af76bbf5e2226b92 (patch)
treefa46b52be89cd094f5af41cce621547114025d80 /Gemfile.lock
parent4f2005df1dc7ca91673ae4ed5ef35130c714ddd9 (diff)
parent2066cb6cf40747068afcfa159a04a277f38ab804 (diff)
downloadgitlab-ce-b458b4158019013e468e9478af76bbf5e2226b92.tar.gz
Merge branch 'sh-upgrade-grpc-and-protobuf' into 'master'
Bump gRPC to 1.19.0 and protobuf to 3.7.1 See merge request gitlab-org/gitlab-ce!27086
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 15ed261526a..da8f8db9528 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -316,8 +316,8 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.6.1)
- googleapis-common-protos-types (1.0.3)
+ google-protobuf (3.7.1)
+ googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.6.6)
faraday (~> 0.12)
@@ -348,7 +348,7 @@ GEM
railties
sprockets-rails
graphql (1.8.1)
- grpc (1.15.0)
+ grpc (1.19.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
haml (5.0.4)
@@ -1062,7 +1062,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
- google-protobuf (~> 3.6)
+ google-protobuf (~> 3.7.1)
gpgme (~> 2.0.18)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
@@ -1070,7 +1070,7 @@ DEPENDENCIES
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
- grpc (~> 1.15.0)
+ grpc (~> 1.19.0)
haml_lint (~> 0.28.0)
hamlit (~> 2.8.8)
hangouts-chat (~> 0.0.5)