diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-01 06:51:12 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-01 14:24:06 +0300 |
| commit | 3fe18525ddca414017d330e992999bad05002fa8 (patch) | |
| tree | 04836fccf41e3228324f162dbb399c9e3c0360be /spec/support | |
| parent | e91fe7553db6f1e9d286df4941a1847f27a767d5 (diff) | |
Trim extra displayed carriage returns in diffs and files with CRLFs
Closes #20440
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 3735abe2302..4561aa9644d 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -21,7 +21,8 @@ module TestEnv 'expand-collapse-diffs' => '4842455', 'expand-collapse-files' => '025db92', 'expand-collapse-lines' => '238e82d', - 'video' => '8879059' + 'video' => '8879059', + 'crlf-diff' => '5938907' } # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |