75ed0e27d9
Handle non-UTF-8 conflicts gracefully ## What does this MR do? If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI. ## What are the relevant issue numbers? Closes #21247. See merge request !5961 |
||
---|---|---|
.. | ||
banzai | ||
ci | ||
container_registry | ||
gitlab | ||
json_web_token | ||
disable_email_interceptor_spec.rb | ||
extracts_path_spec.rb | ||
file_size_validator_spec.rb | ||
git_ref_validator_spec.rb | ||
gitlab_spec.rb | ||
repository_cache_spec.rb |