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). |
||
|---|---|---|
| .. | ||
| conflict | ||
| storage | ||
| attributes_at_ref_parser.rb | ||
| attributes_parser.rb | ||
| blame.rb | ||
| blob.rb | ||
| blob_snippet.rb | ||
| branch.rb | ||
| commit.rb | ||
| commit_stats.rb | ||
| compare.rb | ||
| diff.rb | ||
| diff_collection.rb | ||
| env.rb | ||
| gitlab_projects.rb | ||
| gitmodules_parser.rb | ||
| hook.rb | ||
| hooks_service.rb | ||
| index.rb | ||
| info_attributes.rb | ||
| lfs_changes.rb | ||
| lfs_pointer_file.rb | ||
| operation_service.rb | ||
| path_helper.rb | ||
| popen.rb | ||
| ref.rb | ||
| remote_mirror.rb | ||
| remote_repository.rb | ||
| repository.rb | ||
| repository_mirroring.rb | ||
| rev_list.rb | ||
| storage.rb | ||
| tag.rb | ||
| tree.rb | ||
| user.rb | ||
| util.rb | ||
| wiki.rb | ||
| wiki_file.rb | ||
| wiki_page.rb | ||
| wiki_page_version.rb | ||