diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-29 13:10:24 -0500 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-29 13:10:24 -0500 |
commit | bd2822ce1f67c5e50ead272962840638fe37a1f7 (patch) | |
tree | 2b38d2d4943b1b70eb0bce66dc40a562accfc363 /Gemfile | |
parent | b452b0c7056e481778bfc5838d47dca813bf12ed (diff) | |
parent | a7976905d17c22b0f2caeb54fa7f468568412cd1 (diff) | |
download | gitlab-ce-bd2822ce1f67c5e50ead272962840638fe37a1f7.tar.gz |
Merge remote-tracking branch 'origin/master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |