diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-07-29 16:44:04 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-07-29 16:44:04 +0300 |
| commit | 05b518aa4d5a690ab90f7026b3684659c9d51fa9 (patch) | |
| tree | d34d37bcbe77cf73007d1d272e05c7ca94113f07 /spec/support/test_env.rb | |
| parent | 097a8952d0991b42752a84aedd472aa8291717cf (diff) | |
| parent | 8bda433734394af7e3858c0804b378a6d1313a84 (diff) | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
Diffstat (limited to 'spec/support/test_env.rb')
| -rw-r--r-- | spec/support/test_env.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index ae0b95ea444..8dc687c3580 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -12,7 +12,8 @@ module TestEnv 'fix' => '12d65c8', 'improve/awesome' => '5937ac0', 'markdown' => '0ed8c6c', - 'master' => '5937ac0' + 'master' => '5937ac0', + "'test'" => 'e56497b', } # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |