summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-21 14:28:48 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-21 14:28:48 +0000
commit1ce523c1331e7e541f41d8733d1b9d7f729dcca5 (patch)
treea41ed85c532a341b4befe11ba242c6304578c129 /Gemfile
parentd0da5852335251e4fa7dfbc37ff138b2a3c83cfb (diff)
parentb043100b65b0b5ac2cf0465864678181783c58bc (diff)
downloadgitlab-ce-1ce523c1331e7e541f41d8733d1b9d7f729dcca5.tar.gz
Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'
Migrate Gitlab::Git::Commit.find_all to Gitaly Closes gitaly#396 See merge request !12934
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 4a3fd5d7408..1ee44680774 100644
--- a/Gemfile
+++ b/Gemfile
@@ -386,7 +386,7 @@ gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6'
# Gitaly GRPC client
-gem 'gitaly', '~> 0.17.0'
+gem 'gitaly', '~> 0.18.0'
gem 'toml-rb', '~> 0.3.15', require: false