diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-03 14:02:25 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-03 14:02:25 +0300 |
| commit | 9533786f522e358f372d8a0ec4b4990ae9d88f37 (patch) | |
| tree | 57e7a458ed19834748c67a91e91f0ff78da6e6fb | |
| parent | 69b39192fd0186dba2b4c7834eab22ee150d8b88 (diff) | |
| parent | 4706554629557880b24e2dc09b5a6dfcc93a5bd5 (diff) | |
Merge branch 'feature/bump-gitaly-proto-version' into 'master'
Bump gitaly-proto version to v0.39.0
See merge request gitlab-org/gitlab-ce!14638
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -398,7 +398,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.38.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 03ffb880fc9..aa0c5148b1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,7 +275,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.38.0) + gitaly-proto (0.39.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) |