diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-19 13:03:54 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-19 13:03:54 +0000 |
commit | f9fd9b1def8dec9800f8d3857ee278ed6dca03c3 (patch) | |
tree | 2cbb53d5c73df8dab9e7baf3d7f65230bab06858 /Gemfile | |
parent | fd86e7432744979c0f17fc0dcca157a6606a15c0 (diff) | |
parent | 752e9c18a1c2521636ddeec65b7bda2035ce1893 (diff) | |
download | gitlab-ce-f9fd9b1def8dec9800f8d3857ee278ed6dca03c3.tar.gz |
Merge branch 'zj-pool-destruction' into 'master'
Leave object pools when destroying projects
Closes gitaly#1415
See merge request gitlab-org/gitlab-ce!23869
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -419,7 +419,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' |