diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-07-16 09:27:41 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-07-16 09:27:41 +0000 |
| commit | bae51b0686ca37ada06fc2d400c265a98f0c6c34 (patch) | |
| tree | 51bdebd8948f1106a61d10dcb1e387e497fec4a9 | |
| parent | 573dee278d0d4ee7666a413cf5a5d7258c48c9ea (diff) | |
| parent | 63b07f52422d1318d3d28912149b8ab42381539e (diff) | |
| download | gitlab-ce-bae51b0686ca37ada06fc2d400c265a98f0c6c34.tar.gz | |
Merge branch 'zj-update-proto' into 'master'
Upgrade Gitaly-Proto to 1.37.0
See merge request gitlab-org/gitlab-ce!30774
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -431,7 +431,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.36.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly' gem 'grpc', '~> 1.19.0' diff --git a/Gemfile.lock b/Gemfile.lock index bf469de3835..beded888ffd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -310,7 +310,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.36.0) + gitaly-proto (1.37.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-labkit (0.3.0) @@ -1119,7 +1119,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.36.0) + gitaly-proto (~> 1.37.0) github-markup (~> 1.7.0) gitlab-labkit (~> 0.3.0) gitlab-markup (~> 1.7.0) diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb index d8e9dccb644..ca3e5b51ecc 100644 --- a/lib/gitlab/gitaly_client/repository_service.rb +++ b/lib/gitlab/gitaly_client/repository_service.rb @@ -5,7 +5,7 @@ module Gitlab class RepositoryService include Gitlab::EncodingHelper - MAX_MSG_SIZE = 128.kilobytes.freeze + MAX_MSG_SIZE = 128.kilobytes def initialize(repository) @repository = repository |