diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-07 12:25:42 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-07 12:25:42 +0000 |
commit | 411070c3afa621a0bdc741617c1d17f54205b81a (patch) | |
tree | 66e77bbc7d2fe55ecdb22c8b166dc0369a60aed0 /spec | |
parent | f996f7e006b206ad6505dd1edd740fa142dbcb21 (diff) | |
parent | 5c748a0bd9665c2036340d3f2b475df013810e62 (diff) | |
download | gitlab-ce-411070c3afa621a0bdc741617c1d17f54205b81a.tar.gz |
Merge branch 'ce-rd-gitaly-client-for-list-new-objects-rpc' into 'master'
Backport of gitlab-ee!6767
See merge request gitlab-org/gitlab-ce!21037
Diffstat (limited to 'spec')
-rw-r--r-- | spec/support/helpers/test_env.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 8e1d4cfe269..9c6486a35c4 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -51,7 +51,8 @@ module TestEnv 'add-pdf-text-binary' => '79faa7b', 'add_images_and_changes' => '010d106', 'update-gitlab-shell-v-6-0-1' => '2f61d70', - 'update-gitlab-shell-v-6-0-3' => 'de78448' + 'update-gitlab-shell-v-6-0-3' => 'de78448', + '2-mb-file' => 'bf12d25' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |