diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-11-27 16:27:51 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-11-28 11:50:05 +0000 |
| commit | 14076062df5d9f369c42796e754b3918965a0623 (patch) | |
| tree | 6f3e1a36914178a879002a2872d8e1e114652a1c /lib | |
| parent | a54352406ae4d85a8c3352b4f6a7dfe669ecd817 (diff) | |
| download | gitlab-ce-14076062df5d9f369c42796e754b3918965a0623.tar.gz | |
Commits API: Preserve file content in move operations if unspecified
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]}'" |