summaryrefslogtreecommitdiff
path: root/spec/support/test_env.rb
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2015-12-04 17:31:01 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2015-12-04 17:35:14 -0200
commit12fdc13ad386299b04431c43c7d4ab307698b1a8 (patch)
tree824eb97c41c4218d20a60eadb292f0e3cde36456 /spec/support/test_env.rb
parente7e22ece5a63d15c221a73cd544ae83a33770bfe (diff)
downloadgitlab-ce-12fdc13ad386299b04431c43c7d4ab307698b1a8.tar.gz
Fix 500 error when creating a merge request that removes a submodule
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