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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 96b453344a1..d7ef3b114d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.1.0) + gitaly-proto (1.2.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -1006,7 +1006,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.1.0) + gitaly-proto (~> 1.2.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) |