diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-29 14:36:16 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-29 14:36:16 +0300 |
| commit | 7c0718cd79b9f7976e3a9d78fdc6661a6c9ebfba (patch) | |
| tree | 9bcc63207ca7841414c7e5da0b1ad7589da3f4fd /lib | |
| parent | 938b891f89403ced0268699a6295531db508be17 (diff) | |
| parent | 14076062df5d9f369c42796e754b3918965a0623 (diff) | |
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 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client/operation_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/operation_service.rb b/lib/gitlab/gitaly_client/operation_service.rb index c32c2c0b2fb..22d2d149e65 100644 --- a/lib/gitlab/gitaly_client/operation_service.rb +++ b/lib/gitlab/gitaly_client/operation_service.rb @@ -385,7 +385,8 @@ module Gitlab file_path: encode_binary(action[:file_path]), previous_path: encode_binary(action[:previous_path]), base64_content: action[:encoding] == 'base64', - execute_filemode: !!action[:execute_filemode] + execute_filemode: !!action[:execute_filemode], + infer_content: !!action[:infer_content] ) rescue RangeError raise ArgumentError, "Unknown action '#{action[:action]}'" |