diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-10-21 13:28:06 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-10-21 13:28:06 +0300 |
| commit | fe09d608d335767411fd908b852819d7ee5effed (patch) | |
| tree | 3f8a28715d3311e30f760a787f66bb612882d3a3 | |
| parent | 772ef62b65125bf87441c064fa021f3a16e82cf9 (diff) | |
| parent | 8a9b83c38aaa64e797c741688555e22bf87e3b3b (diff) | |
Merge branch 'sh-upgrade-grpc-ruby' into 'master'
Upgrade gRPC Ruby library to v1.24.0
See merge request gitlab-org/gitaly!1565
| -rw-r--r-- | changelogs/unreleased/sh-upgrade-grpc-ruby.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 4 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 12 |
3 files changed, 13 insertions, 8 deletions
diff --git a/changelogs/unreleased/sh-upgrade-grpc-ruby.yml b/changelogs/unreleased/sh-upgrade-grpc-ruby.yml new file mode 100644 index 000000000..705fcd6f3 --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-grpc-ruby.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade gRPC Ruby library to v1.24.0 +merge_request: +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index 9478dc9a8..e2fa117b6 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -10,7 +10,7 @@ gem 'activesupport', '~> 5.2.3' 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.19.0' +gem 'grpc', '~> 1.24.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.5.0' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.7.1' +gem 'google-protobuf', '~> 3.8.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index cb292af8c..b84a30ecb 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -81,12 +81,12 @@ GEM gitlab-markup (1.7.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - google-protobuf (3.7.1) + google-protobuf (3.8.0) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.19.0) - google-protobuf (~> 3.1) - googleapis-common-protos-types (~> 1.0.0) + grpc (1.24.0) + google-protobuf (~> 3.8) + googleapis-common-protos-types (~> 1.0) hashdiff (0.3.9) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -222,8 +222,8 @@ DEPENDENCIES gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.5.0) gitlab-markup (~> 1.7.0) - google-protobuf (~> 3.7.1) - grpc (~> 1.19.0) + google-protobuf (~> 3.8.0) + grpc (~> 1.24.0) licensee (~> 8.9.0) listen (~> 0.5.0) pry (~> 0.12.2) |