diff options
| author | Pirate Praveen <praveen@onenetbeyond.org> | 2020-03-21 14:59:48 +0300 |
|---|---|---|
| committer | Pirate Praveen <praveen@onenetbeyond.org> | 2020-04-06 18:41:57 +0300 |
| commit | 7fbf17ddbd385b014d284b78dbaf832310e41add (patch) | |
| tree | 81d11c9d2afff381e617f568aa30da6b07d129f5 | |
| parent | 1010aad12c3c342858e9881bcf6b09a3efd3c9e6 (diff) | |
Update grpc and google-protobuf gems to match grpc-tools version
| -rw-r--r-- | ruby/Gemfile | 4 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index d9a60e073..1d50ea07c 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -10,7 +10,7 @@ gem 'activesupport', '6.0.2' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -gem 'grpc', '~> 1.24.0' +gem 'grpc', '~> 1.27.0' gem 'sentry-raven', '~> 2.9.0', require: false gem 'faraday', '~> 0.12' gem 'rbtrace', require: false @@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.9.1' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.8.0' +gem 'google-protobuf', '~> 3.11.2' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 4120bb3ad..acafd8f43 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -75,11 +75,11 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.0) - google-protobuf (3.8.0) + google-protobuf (3.11.4) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.24.0) - google-protobuf (~> 3.8) + grpc (1.27.0) + google-protobuf (~> 3.11) googleapis-common-protos-types (~> 1.0) hashdiff (0.3.9) i18n (1.8.2) @@ -216,8 +216,8 @@ DEPENDENCIES gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.9.1) gitlab-markup (~> 1.7.0) - google-protobuf (~> 3.8.0) - grpc (~> 1.24.0) + google-protobuf (~> 3.11.2) + grpc (~> 1.27.0) licensee (~> 8.9.0) listen (~> 0.5.0) pry (~> 0.12.2) |