diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-13 03:55:49 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-16 00:49:01 +0300 |
| commit | 1f5e809c047d9561fe03d04c51b1dc4fffd95e04 (patch) | |
| tree | d8bd865e43e592e846adcc1a3de02e36c4fd982a /app/services/files | |
| parent | ca66a04ffec2e311e72b5bdd2c68d3286ef6631c (diff) | |
Use correct encoding with Lfs::FileTransfromer
Diffstat (limited to 'app/services/files')
| -rw-r--r-- | app/services/files/multi_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/files/multi_service.rb b/app/services/files/multi_service.rb index be9c7c526a6..13a1dee4173 100644 --- a/app/services/files/multi_service.rb +++ b/app/services/files/multi_service.rb @@ -15,8 +15,9 @@ module Files def actions_after_lfs_transformation(transformer, actions) actions.map do |action| if action[:action] == 'create' - content = transformer.new_file(action[:file_path], action[:content]) - action[:content] = content + result = transformer.new_file(action[:file_path], action[:content], encoding: action[:encoding]) + action[:content] = result.content + action[:encoding] = result.encoding end action |