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 /spec/support | |
| 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 'spec/support')
| -rw-r--r-- | spec/support/test_env.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 0a194ca4c90..c32c05b03e2 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -41,7 +41,8 @@ module TestEnv 'csv' => '3dd0896', 'v1.1.0' => 'b83d6e3', 'add-ipython-files' => '93ee732', - 'add-pdf-file' => 'e774ebd' + 'add-pdf-file' => 'e774ebd', + 'add-pdf-text-binary' => '79faa7b' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |