Prepare 11.0 RC6 EE release
Compare changes
Files
2- Jacob Vosmaer authored
+ 5
− 0
@@ -1397,6 +1397,11 @@ def multi_action(
Main release issue: gitlab-org/release/tasks#243 (closed)
This MR prepares 11-0-stable-ee
for %11.0 (RC6
) by merging 11-0-stable-ee-prepare-rc6
into 11-0-stable-ee
.
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6031, will merge into `11-0-stable-ee` ready for `11.0 RC6 EE`
/unlabel ~"Pick into 11.0"
11-0-stable-ee-prepare-rc6
locally and using git cherry-pick -m1 MERGE_COMMIT_SHA
MERGE_COMMIT_SHA
is to go the Discussion tab in the Merge Request. The merge commit SHA will be visible right before the comment of it being merged. Sometimes the merge commit SHA will not be available in the Discussion tab, in those cases you have to look for it in the commits tab for master
11-0-stable-ee-prepare-rc6
branch and assign it to the author of the conflicting files.VERSION
file in ee
will have a conflict. Accept the -ee
one