diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-07-10 17:00:13 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-07-10 17:06:20 +0300 |
| commit | 57fc7cd8f35525f772d7c59a2aa45c96467cb882 (patch) | |
| tree | 12123ad5d95b5bd5b3335996cbe398f27d9780c1 /spec/support | |
| parent | 3d4873fa64c833c71ab7ee274002d854eb93ef96 (diff) | |
Make sure ConflictsService does not raise for conflicting submodules
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/helpers/test_env.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 05a8e6206ae..e531495d917 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -49,7 +49,9 @@ module TestEnv 'add-pdf-file' => 'e774ebd', 'squash-large-files' => '54cec52', 'add-pdf-text-binary' => '79faa7b', - 'add_images_and_changes' => '010d106' + 'add_images_and_changes' => '010d106', + 'update-gitlab-shell-v-6-0-1' => '2f61d70', + 'update-gitlab-shell-v-6-0-3' => 'de78448' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |