summaryrefslogtreecommitdiff
path: root/spec/support/test_env.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-08 12:47:09 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-08 12:47:09 +0100
commit048605bd33935cd2b37c72bf2b725e9c37e1f6e8 (patch)
treecaf35eb873412ae71721e9244c1f899e351cff3e /spec/support/test_env.rb
parenta426fb1596978221510c8c78a17703658ad7d161 (diff)
parentf5430e48b42227f1c1874ca27c6907f0f704be28 (diff)
downloadgitlab-ce-issue-closing-docs.tar.gz
Merge branch 'master' into issue-closing-docsissue-closing-docs
Diffstat (limited to 'spec/support/test_env.rb')
-rw-r--r--spec/support/test_env.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 787670e9297..78b9a0f42fa 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -21,7 +21,8 @@ module TestEnv
# We currently only need a subset of the branches
FORKED_BRANCH_SHA = {
'add-submodule-version-bump' => '3f547c08',
- 'master' => '5937ac0'
+ 'master' => '5937ac0',
+ 'remove-submodule' => '2a33e0c0'
}
# Test environment