summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-12-04 19:20:01 +0000
committerRobert Speicher <robert@gitlab.com>2017-12-04 19:20:01 +0000
commitf3a3bd50eafdcfcaeea21d6cfa0b8bbae7720fec (patch)
treef11390dcf7b4bbfd103d33f5c79a4ed5524836c0 /Gemfile
parentc7940733b410d5f55bbe150dd9b44453fdc9a731 (diff)
parent8be9567c64d2c90a56e36308f39ee89938137614 (diff)
downloadgitlab-ce-f3a3bd50eafdcfcaeea21d6cfa0b8bbae7720fec.tar.gz
Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#cherry_pick to Gitaly Closes gitaly#737 See merge request gitlab-org/gitlab-ce!15517
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 1ea500d23b3..044778498a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -400,7 +400,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.54.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.58.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false