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

Merge branch 'feature/bump-gitaly-proto-version' into 'master'
9533786f · Robert Speicher · 69b39192 · 47065546 · 9533786f · 9533786f
Commit 9533786f authored Oct 03, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -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


--- 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)