diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 12:09:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 12:09:18 +0000 |
| commit | b7c735c8ac11b8182807070fc6f84f2606e15427 (patch) | |
| tree | e74b4d25abb8bbf23546f001dd94515e2840a3a3 /spec/support/helpers/test_env.rb | |
| parent | 221b529789f4090341a825695aeb49b8df6dd11d (diff) | |
| download | gitlab-ce-b7c735c8ac11b8182807070fc6f84f2606e15427.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/helpers/test_env.rb')
| -rw-r--r-- | spec/support/helpers/test_env.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index fd41c5c8fe3..47d69ca1f6a 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -73,7 +73,9 @@ module TestEnv 'submodule_inside_folder' => 'b491b92', 'png-lfs' => 'fe42f41', 'sha-starting-with-large-number' => '8426165', - 'invalid-utf8-diff-paths' => '99e4853' + 'invalid-utf8-diff-paths' => '99e4853', + 'compare-with-merge-head-source' => 'b5f4399', + 'compare-with-merge-head-target' => '2f1e176' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |