diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 15:22:04 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 15:22:04 +0100 |
| commit | 15925290eec4f5616e12ef3169794f85150e3270 (patch) | |
| tree | b1adb5784f74a05491a38b8656e179f451b79e5e /spec/support/test_env.rb | |
| parent | 0c3f70acf4838194f517c02874b8423303c21b48 (diff) | |
| parent | 51ed5225adf4aac3ccbf715f8647258dac784abb (diff) | |
| download | gitlab-ce-ui/dashboard-new-issue.tar.gz | |
Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issue
Diffstat (limited to 'spec/support/test_env.rb')
| -rw-r--r-- | spec/support/test_env.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 787670e9297..4f4743bff6d 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -12,6 +12,7 @@ module TestEnv 'fix' => '48f0be4', 'improve/awesome' => '5937ac0', 'markdown' => '0ed8c6c', + 'lfs' => 'be93687', 'master' => '5937ac0', "'test'" => 'e56497b', } @@ -21,7 +22,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 |