diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-07-25 17:57:02 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-07-26 15:34:57 +0100 |
| commit | 396b8f91ec47ffb5a02ebf6d713ef4cbf04f1f94 (patch) | |
| tree | c27074b1608622faa29efb8275be983a9331b2db /changelogs | |
| parent | 0c563225b663742b4f26731dc7bc822a38f7289b (diff) | |
| download | gitlab-ce-396b8f91ec47ffb5a02ebf6d713ef4cbf04f1f94.tar.gz | |
Fix saving diffs that are not valid UTF-835539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters
Previously, we used Psych, which would:
1. Check if a string was encoded as binary, and not ASCII-compatible.
2. Add the !binary tag in that case.
3. Convert to base64.
We need to do the same thing, using a new column in place of the tag.
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters.yml b/changelogs/unreleased/35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters.yml new file mode 100644 index 00000000000..8d92aacc9ef --- /dev/null +++ b/changelogs/unreleased/35539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters.yml @@ -0,0 +1,5 @@ +--- +title: Fix creating merge request diffs when diff contains bytes that are invalid + in UTF-8 +merge_request: +author: |