Skip to content

Fix UTF-8 conversion issues when resolving conflicts

Stan Hu requested to merge sh-fix-utf-8-encoding-resolve-conflicts into master

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/63030, when the commit message in the /resolve_conflicts endpoint contains a UTF-8 character, the conversion to the Gitaly ASCII-8BIT value may flag an error. To fix this, we run force_encoding on the commit message.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63062

Edited by Stan Hu

Merge request reports