summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-09-06 11:23:22 +0000
committerDouwe Maan <douwe@gitlab.com>2018-09-06 11:23:22 +0000
commit98ae35a8b08c86f7a380aecfb967f092cc1e0ef0 (patch)
tree251cf64c3094839ae002b721098a89846aeeba64 /spec/support
parent4ad792dede4d9a68df6b4797a72c46f65bdcaccd (diff)
parentc826ecc3e76917d7b77701551e25425da9274b2e (diff)
downloadgitlab-ce-98ae35a8b08c86f7a380aecfb967f092cc1e0ef0.tar.gz
Merge branch 'bvl-codeowners-file-ce' into 'master'
Port changes for CODEOWNERS to CE See merge request gitlab-org/gitlab-ce!21309
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/helpers/test_env.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index 21103771d1f..3f8e3ae5190 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -52,7 +52,8 @@ module TestEnv
'add_images_and_changes' => '010d106',
'update-gitlab-shell-v-6-0-1' => '2f61d70',
'update-gitlab-shell-v-6-0-3' => 'de78448',
- '2-mb-file' => 'bf12d25'
+ '2-mb-file' => 'bf12d25',
+ 'with-codeowners' => '219560e'
}.freeze
# gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily