Prepare 10.2.1 release
Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/40425
Summary
This MR prepares 10-2-stable
for %10.2 (10.2.1
) by merging 10-2-stable-patch-1
into 10-2-stable
.
MR Filter for ~"Pick into 10.2" MRs
Note to leave in MRs
Picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15551, will merge into `10-2-stable` ready for `10.2.1`
/unlabel ~"Pick into 10.2"
Steps
- Cherry-pick commits into this MR using the link for ~"Pick into 10.2" above.
- This can be done by checking out
10-2-stable-patch-1
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.2" label.
- If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the
10-2-stable-patch-1
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.2" have been picked~~ -
Picked critical fix disabling Prometheus https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15549 -
Conflicts resolved -
No new commits have introduced directly to the stable branch while this MR was in progress. If there are, ensure these are merged into EE and check for a green pipeline after merging this MR.
Edited by Michael Kozono