diff options
author | Stan Hu <stanhu@gmail.com> | 2015-07-21 02:55:45 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-07-22 00:12:43 +0300 |
commit | 643557dabccbb3a503b0867ae44ec5701759d2a8 (patch) | |
tree | d50c3315b5e4a7461deac389a09a3aceb5b60e03 /spec/support/test_env.rb | |
parent | 57f9a1ccd4e97747cf09ffd98e8c44056c0846e5 (diff) |
Fix 404 error in files view after deleting the last file in a repository
Closes #1362
Diffstat (limited to 'spec/support/test_env.rb')
-rw-r--r-- | spec/support/test_env.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 8bdd6b43cdd..dcf2a9e2ce5 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -5,6 +5,7 @@ module TestEnv # When developing the seed repository, comment out the branch you will modify. BRANCH_SHA = { + 'empty-branch' => '7efb185', 'flatten-dir' => 'e56497b', 'feature' => '0b4bc9a', 'feature_conflict' => 'bb5206f', @@ -14,9 +15,13 @@ module TestEnv 'master' => '5937ac0' } - FORKED_BRANCH_SHA = BRANCH_SHA.merge({ - 'add-submodule-version-bump' => '3f547c08' - }) + # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily + # need to keep all the branches in sync. + # We currently only need a subset of the branches + FORKED_BRANCH_SHA = { + 'add-submodule-version-bump' => '3f547c08', + 'master' => '5937ac0' + } # Test environment # |