Prepare 10.4 RC2 EE release
Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/41629
Summary
This MR prepares 10-4-stable-ee
for %10.4 (RC2
) by merging 10-4-stable-ee-prepare-rc2
into 10-4-stable-ee
.
MR Filter for ~"Pick into 10.4" MRs
Note to leave in MRs
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3958, will merge into `10-4-stable-ee` ready for `10.4 RC2 EE`
/unlabel ~"Pick into 10.4"
Steps
- Cherry-pick commits into this MR using the link for ~"Pick into 10.4" above.
- This can be done by checking out
10-4-stable-ee-prepare-rc2
locally and usinggit cherry-pick -m1 MERGE_COMMIT_SHA
- Push changes every so often and verify that the MR has been included
- Leave a note in the MR so others can easily see that it is on track to be included in a release.
- Remove the ~"Pick into 10.4" label.
- If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the
10-4-stable-ee-prepare-rc2
branch and assign it to the author of the conflicting files. - Merge CE-to-EE using one of the workflows described in the Merge CE stable changes to EE docs
- Once this MR is green merge it to stable, preferably with a manual fast-forward merge to minimize waiting time, as described in Merging preparation MRs into stable
Checklist
-
Changes marked ~"Pick into 10.4" have been picked -
CE->EE merge has taken place -
Conflicts resolved -
No new commits have introduced directly to the stable branch while this MR was in progress. If there are, check for a green pipeline after merging this MR.
Edited by Robert Speicher