diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 09:09:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 09:09:43 +0000 |
| commit | f5050253469fc0961c02deec0e698ad62bdd9de5 (patch) | |
| tree | 30bbd8f8b556fd5b730f0123921138ee1d6bdaa2 /Gemfile.lock | |
| parent | f6cdec670b9b757fc2225a2c6627ab79765e5b8a (diff) | |
| download | gitlab-ce-f5050253469fc0961c02deec0e698ad62bdd9de5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1f978df8d31..c65e2252ce6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -427,7 +427,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.11.4) + google-protobuf (3.8.0) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) googleauth (0.6.6) @@ -468,8 +468,8 @@ GEM graphql (~> 1.6) html-pipeline (~> 2.8) sass (~> 3.4) - grpc (1.27.0) - google-protobuf (~> 3.11) + grpc (1.24.0) + google-protobuf (~> 3.8) googleapis-common-protos-types (~> 1.0) gssapi (1.2.0) ffi (>= 1.0.1) @@ -1251,7 +1251,7 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) - google-protobuf (~> 3.11.2) + google-protobuf (~> 3.8.0) gpgme (~> 2.0.19) grape (~> 1.1.0) grape-entity (~> 0.7.1) @@ -1260,7 +1260,7 @@ DEPENDENCIES graphiql-rails (~> 1.4.10) graphql (~> 1.10.5) graphql-docs (~> 1.6.0) - grpc (~> 1.27.0) + grpc (~> 1.24.0) gssapi guard-rspec haml_lint (~> 0.34.0) |