diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-23 18:37:14 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-25 10:27:08 +0300 |
| commit | 44eb3197a9c30503a00384b3d688b64558b80397 (patch) | |
| tree | 852391adf4834d2ef8cc6a53e173e93c5b533c9b /spec/support/test_env.rb | |
| parent | b2bf01f4c271be66e93ed6f4b48a1da4d50e558d (diff) | |
Handle non-UTF-8 conflicts gracefully
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
Diffstat (limited to 'spec/support/test_env.rb')
| -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 edbbfc3c9e5..c7a45fc4ff9 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -24,11 +24,12 @@ module TestEnv 'expand-collapse-lines' => '238e82d', 'video' => '8879059', 'crlf-diff' => '5938907', - 'conflict-start' => '14fa46b', + 'conflict-start' => '75284c7', 'conflict-resolvable' => '1450cd6', 'conflict-binary-file' => '259a6fb', 'conflict-contains-conflict-markers' => '5e0964c', 'conflict-missing-side' => 'eb227b3', + 'conflict-non-utf8' => 'd0a293c', 'conflict-too-large' => '39fa04f', } |