diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-11-03 12:36:19 +0300 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-12-07 14:24:34 +0300 |
| commit | 1f7647f446c9659ec0a41e48433a711e95f0b153 (patch) | |
| tree | 19fb693fd54d0b551c5dfcf64825b9e6b888fadd /spec/support/helpers | |
| parent | a89a73c1cc8576d75afc947cec14f19e1ae8a30d (diff) | |
Update merge request's merge_commit for branch update
Analyze new commits graph to determine each commit's merge commit.
Fix "merged with [commit]" info for merge requests being merged
automatically by other actions.
Allow analyzing upto the relevant commit
Diffstat (limited to 'spec/support/helpers')
| -rw-r--r-- | spec/support/helpers/test_env.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 1f00cdf7e92..d52c40ff4f1 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -54,6 +54,9 @@ module TestEnv 'add_images_and_changes' => '010d106', 'update-gitlab-shell-v-6-0-1' => '2f61d70', 'update-gitlab-shell-v-6-0-3' => 'de78448', + 'merge-commit-analyze-before' => '1adbdef', + 'merge-commit-analyze-side-branch' => '8a99451', + 'merge-commit-analyze-after' => '646ece5', '2-mb-file' => 'bf12d25', 'before-create-delete-modify-move' => '845009f', 'between-create-delete-modify-move' => '3f5f443', |