diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-29 11:36:16 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-29 11:36:16 +0000 |
| commit | 7c0718cd79b9f7976e3a9d78fdc6661a6c9ebfba (patch) | |
| tree | 9bcc63207ca7841414c7e5da0b1ad7589da3f4fd /Gemfile | |
| parent | 938b891f89403ced0268699a6295531db508be17 (diff) | |
| parent | 14076062df5d9f369c42796e754b3918965a0623 (diff) | |
| download | gitlab-ce-7c0718cd79b9f7976e3a9d78fdc6661a6c9ebfba.tar.gz | |
Merge branch '51083-fix-move-api' into 'master'
Commits API: Preserve file content in move operations if unspecified
Closes #52974 et #51083
See merge request gitlab-org/gitlab-ce!23387
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -432,7 +432,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.1.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.2.0', require: 'gitaly' gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' |