diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 10:31:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 10:31:28 +0100 |
| commit | 72335694744da87cbfaff20992cb36817f6f8a60 (patch) | |
| tree | 55c1b799be04cf83f425414dce762bf9403e2b85 /app/services | |
| parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) | |
| parent | c31e756644120cab650452e9d1c00a1e2f26ade4 (diff) | |
Merge pull request #1923 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/import_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/import_service.rb b/app/services/import_service.rb index ece5b9ef0..2f48abc36 100644 --- a/app/services/import_service.rb +++ b/app/services/import_service.rb @@ -136,7 +136,7 @@ class ImportService < BaseService end def import_data - Paperclip.io_adapters.for(@import.data).read + Paperclip.io_adapters.for(@import.data).read.force_encoding(Encoding::UTF_8) end def relations_map_for_account(account, account_ids) |