diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-03 12:11:56 -0500 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-03 12:11:56 -0500 |
commit | f682cc189a38e6cbe6ee92a3327d6b865c42e84a (patch) | |
tree | 212dcf7c84a96615040ce81d51cad01e6e9454d0 /Gemfile | |
parent | 62364576bc4e2b141752a6ea9068171fa619a6ff (diff) | |
parent | 18fee3060c78e032777b5dc6b3d1f60432446ea5 (diff) | |
download | gitlab-ce-f682cc189a38e6cbe6ee92a3327d6b865c42e84a.tar.gz |
Merge branch '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.38.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false |