summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-09-29 13:10:24 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-29 13:10:24 -0500
commitbd2822ce1f67c5e50ead272962840638fe37a1f7 (patch)
tree2b38d2d4943b1b70eb0bce66dc40a562accfc363 /Gemfile
parentb452b0c7056e481778bfc5838d47dca813bf12ed (diff)
parenta7976905d17c22b0f2caeb54fa7f468568412cd1 (diff)
downloadgitlab-ce-bd2822ce1f67c5e50ead272962840638fe37a1f7.tar.gz
Merge remote-tracking branch 'origin/master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index b3b9572846e..f66f8b11e9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -398,7 +398,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.38.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false