diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-02-01 14:28:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-02-01 22:43:16 +0000 |
| commit | ea3eaf434e4707ff6db48c5ee478b4fdf8672d1d (patch) | |
| tree | 3a262ae9f5449b958b3e41547a809a242b6d3098 /spec/support/test_env.rb | |
| parent | 659cceb0e8694b58a8b665de3f338245244ef114 (diff) | |
| download | gitlab-ce-squash.tar.gz | |
Backport changes from EE squashsquash
Backport changes from the EE-only squash implementation, which would
otherwise conflict when merge CE into EE.
<https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
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 90f1a9c8798..b87232a350b 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -36,7 +36,8 @@ module TestEnv 'conflict-non-utf8' => 'd0a293c', 'conflict-too-large' => '39fa04f', 'deleted-image-test' => '6c17798', - 'wip' => 'b9238ee' + 'wip' => 'b9238ee', + 'csv' => '3dd0896' } # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |