gitlab-org--gitlab-foss/lib/gitlab/gitaly_client
Sean McGivern 70af1e2e03 Fix 500 error when trying to resolve non-ASCII conflicts in editor
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).
2018-03-23 18:33:14 +00:00
..
attributes_bag.rb
blob_service.rb Incorporate Gitaly's RPCs for Gitlab::Git::LfsChanges 2018-03-02 17:12:08 -03:00
blobs_stitcher.rb Migrate Git::Blob.batch to Gitaly 2018-02-08 00:26:45 +01:00
commit_service.rb Add support for :all option to {count,find}_commits 2018-03-02 14:55:20 +01:00
conflict_files_stitcher.rb Fix 500 error when trying to resolve non-ASCII conflicts in editor 2018-03-23 18:33:14 +00:00
conflicts_service.rb
diff.rb
diff_stitcher.rb
health_check_service.rb
namespace_service.rb
notification_service.rb
operation_service.rb Incorporate OperationService.UserSquash Gitaly RPC 2018-02-02 19:02:40 -03:00
queue_enumerator.rb
ref_service.rb
remote_service.rb
repository_service.rb Make --prune a configurable parameter in fetching a git remote 2018-03-06 00:10:04 -08:00
server_service.rb
storage_settings.rb Route path lookups through legacy_disk_path 2018-03-21 18:18:32 +01:00
util.rb
wiki_file.rb
wiki_page.rb Encode GitalyClient::WikiPage attributes to UTF-8 2018-02-05 12:29:02 +01:00
wiki_service.rb Merge branch 'master' into 'zj-wiki-page-versions' 2018-02-06 16:08:06 +00:00