70af1e2e03
When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't always call `lines`, which meant that we didn't get the benefit of the side-effect from that, where it forced the conflict data itself to UTF-8. To fix that, make this explicit by separating the `raw_content` (any encoding) from the `content` (which is either UTF-8, or an exception is raised). |
||
---|---|---|
.. | ||
attributes_bag.rb | ||
blob_service.rb | ||
blobs_stitcher.rb | ||
commit_service.rb | ||
conflict_files_stitcher.rb | ||
conflicts_service.rb | ||
diff.rb | ||
diff_stitcher.rb | ||
health_check_service.rb | ||
namespace_service.rb | ||
notification_service.rb | ||
operation_service.rb | ||
queue_enumerator.rb | ||
ref_service.rb | ||
remote_service.rb | ||
repository_service.rb | ||
server_service.rb | ||
storage_settings.rb | ||
util.rb | ||
wiki_file.rb | ||
wiki_page.rb | ||
wiki_service.rb |