diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-10 15:50:23 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-10 15:54:14 -0700 |
| commit | 1edf1807c570d74ee0039f5f58ef607ee797187a (patch) | |
| tree | 172ff4fd62d291c2edc322d332b83b5efa6a24da /changelogs | |
| parent | 3017d2a52a3da5dc8e701f442b6d7c65c19cc054 (diff) | |
| download | gitlab-ce-1edf1807c570d74ee0039f5f58ef607ee797187a.tar.gz | |
Fix UTF-8 conversion issues when resolving conflicts
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
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml b/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml new file mode 100644 index 00000000000..31039099788 --- /dev/null +++ b/changelogs/unreleased/sh-fix-utf-8-encoding-resolve-conflicts.yml @@ -0,0 +1,5 @@ +--- +title: Fix UTF-8 conversion issues when resolving conflicts +merge_request: 29453 +author: +type: fixed |