summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-30 18:05:14 +0000
committerStan Hu <stanhu@gmail.com>2019-04-30 18:05:14 +0000
commitf4cc9438e3d59f09b9a6f170f89ddd914d1efa4f (patch)
tree7ef38b73aaea19d7424918ed46ebf02f2798b8d9 /Gemfile.lock
parenta78877bfbf827a61cc1e39601bbe14692a288a6b (diff)
parent5ee7876534891df9c2f5ab6c5112cc47f98b1df5 (diff)
downloadgitlab-ce-f4cc9438e3d59f09b9a6f170f89ddd914d1efa4f.tar.gz
Merge branch 'jc-client-for-fetch-objects-into-pool' into 'master'
Add client methods for FetchIntoObjectPool RPC See merge request gitlab-org/gitlab-ce!27767
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c5ad2357434..3b03a8ef691 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -283,7 +283,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
- gitaly-proto (1.22.0)
+ gitaly-proto (1.26.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
@@ -1056,7 +1056,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 1.22.0)
+ gitaly-proto (~> 1.26.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-labkit (~> 0.1.2)