diff options
| author | John Cai <jcai@gitlab.com> | 2020-07-01 20:21:32 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2020-07-01 20:21:32 +0300 |
| commit | 7d376f93966b45f4b11462fd88a9538b43d2b7a2 (patch) | |
| tree | 8de84bd95ccfa541272279f2ceef538888f4785f | |
| parent | 715cfcc7c66040149447ecdfb2400d0494c88b47 (diff) | |
| parent | 3ad70eb1c6d43c22e9484d0bf5664e63b3777200 (diff) | |
Merge branch 'ps-ruby-grpc-update' into 'master'
Improve Gitaly connection error messages
Closes #2786
See merge request gitlab-org/gitaly!2319
| -rw-r--r-- | ruby/Gemfile | 4 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 8a35c8c3b..42bba735c 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -10,7 +10,7 @@ gem 'activesupport', '~> 6.0.3.1' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -gem 'grpc', '~> 1.24.0' +gem 'grpc', '~> 1.30.0.pre1' gem 'sentry-raven', '~> 2.9.0', require: false gem 'faraday', '~> 0.12' gem 'rbtrace', require: false @@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.12.0' # 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.12.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index da07cf259..8e5a6192b 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.1) - google-protobuf (3.8.0) - googleapis-common-protos-types (1.0.4) - google-protobuf (~> 3.0) - grpc (1.24.0) - google-protobuf (~> 3.8) + google-protobuf (3.12.2) + googleapis-common-protos-types (1.0.5) + google-protobuf (~> 3.11) + grpc (1.30.0.pre1-universal-darwin) + google-protobuf (~> 3.12) googleapis-common-protos-types (~> 1.0) grpc-tools (1.0.1) hashdiff (0.3.9) @@ -217,8 +217,8 @@ DEPENDENCIES gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.12.0) gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.8.0) - grpc (~> 1.24.0) + google-protobuf (~> 3.12.0) + grpc (~> 1.30.0.pre1) grpc-tools (= 1.0.1) licensee (~> 8.9.0) listen (~> 0.5.0) |