diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-12-07 18:27:17 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-12-07 18:27:17 +0300 |
commit | cda291f0c35d3724d2df916fcd95e00e84f469cf (patch) | |
tree | f931eb5c2d2e09beb1f775d58a95d310c491bbab /spec/support | |
parent | 69aaa30dd9e4211e081bf258e79fcfcfc2e8f230 (diff) | |
parent | 2f7563a6746519516c1464ac2a74b7e3c0eca63f (diff) |
Merge branch '48889-populate-merge_commit_sha' into 'master'
Update merge request's merge_commit after branch update
Closes #48889
See merge request gitlab-org/gitlab-ce!22794
Diffstat (limited to 'spec/support')
-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', |