diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-06 14:11:36 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-04-23 08:55:18 +0300 |
| commit | 824637e1fb83130ae237d659703af8d812fa5ef0 (patch) | |
| tree | fd1266365fd3cbb51a2af609e8de4f730c8a2e72 | |
| parent | 384c4754a2091a4ad5c8d5c9a86af78a39a44c90 (diff) | |
Upgrade Ruby gRPC 1.19.0 and protobuf to 3.7.1
This is needed to support Ruby 2.6.
| -rw-r--r-- | changelogs/unreleased/sh-bump-grpc-version.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 4 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/changelogs/unreleased/sh-bump-grpc-version.yml b/changelogs/unreleased/sh-bump-grpc-version.yml new file mode 100644 index 000000000..4672b2048 --- /dev/null +++ b/changelogs/unreleased/sh-bump-grpc-version.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade Ruby gRPC 1.19.0 and protobuf to 3.7.1 +merge_request: 1066 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index b525ecdd4..e29bc050f 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.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -gem 'grpc', '~> 1.15.0' +gem 'grpc', '~> 1.19.0' gem 'sentry-raven', '~> 2.9.0', require: false gem 'faraday', '~> 0.12' gem 'rbtrace', require: false @@ -20,7 +20,7 @@ gem 'rbtrace', require: false # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.6' +gem 'google-protobuf', '~> 3.7.1' group :development, :test do gem 'rubocop', '~> 0.50', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index f1865cec8..983ba3a79 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -66,7 +66,7 @@ GEM google-protobuf (3.7.1) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.15.0) + grpc (1.19.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) hashdiff (0.3.8) @@ -187,8 +187,8 @@ DEPENDENCIES gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-markup (~> 1.7.0) - google-protobuf (~> 3.6) - grpc (~> 1.15.0) + google-protobuf (~> 3.7.1) + grpc (~> 1.19.0) licensee (~> 8.9.0) listen (~> 0.5.0) pry (~> 0.12.2) |