summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2017-12-06 16:54:57 +0100
committerAhmad Sherif <me@ahmadsherif.com>2017-12-13 17:40:19 +0100
commit835a5db376a69dce20ba616d480a5a9ab15b2577 (patch)
tree0ecba5bbfa679966cba50e62b0ff19c4d944fc12 /Gemfile
parent689bc9ea6db102006b548e6176125157955c7f2b (diff)
downloadgitlab-ce-835a5db376a69dce20ba616d480a5a9ab15b2577.tar.gz
Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitaly
Closes gitaly#808
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 93003ed96c4..d0fb44c12c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -400,7 +400,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.61.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false