Merge branch 'ps-gitaly-gem-update' into 'master'

Update of Gitaly gem See merge request gitlab-org/gitlab!33378

Merge branch 'ps-gitaly-gem-update' into 'master'
Update of Gitaly gem See merge request gitlab-org/gitlab!33378
d29ffa79 · Douglas Barbosa Alexandre · 391f364d · ef2acaf9 · d29ffa79 · d29ffa79
Commit d29ffa79 authored May 29, 2020 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -453,7 +453,7 @@ group :ed25519 do
 end

 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.0.0.pre.rc1'
+gem 'gitaly', '~> 13.1.0.pre.rc1'

 gem 'grpc', '~> 1.24.0'


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -377,7 +377,7 @@ GEM
      po_to_json (>= 1.0.0)
      rails (>= 3.2.0)
    git (1.5.0)
-    gitaly (13.0.0.pre.rc1)
+    gitaly (13.1.0.pre.rc1)
      grpc (~> 1.0)
    github-markup (1.7.0)
    gitlab-chronic (0.10.5)
@@ -1235,7 +1235,7 @@ DEPENDENCIES
  gettext (~> 3.2.2)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 13.0.0.pre.rc1)
+  gitaly (~> 13.1.0.pre.rc1)
  github-markup (~> 1.7.0)
  gitlab-chronic (~> 0.10.5)
  gitlab-labkit (= 0.12.0)