diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-13 13:07:49 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-13 13:07:49 +0000 |
| commit | d7326003a0317a5abc98a830bfac2f54ad752c08 (patch) | |
| tree | 547d069da4635b4753f77cb08b26adf777a145ce /Gemfile | |
| parent | 5e0fca33220708e16f3862aa93b49fade8d719a5 (diff) | |
| parent | 0aff29f96b54e8036fe46315adb45295bc6c9efd (diff) | |
| download | gitlab-ce-d7326003a0317a5abc98a830bfac2f54ad752c08.tar.gz | |
Merge branch 'gitaly-merge' into 'master'
Merge Merge Requests via Gitaly
Closes gitaly#654
See merge request gitlab-org/gitlab-ce!14791
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.41.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.42.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false |