Prepare 10.3.6-ee release
https://gitlab.slack.com/archives/C0XM5UU6B/p1516278532000304?thread_ts=1516267777.000279&cid=C0XM5UU6B)
WARNING: This is now the 10.3.6 Release EE preparation branch (Explanation:Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/42164
Summary
This MR prepares 10-3-stable-ee
for %10.3 (10.3.5-ee
) by merging 10-3-stable-ee-patch-5
into 10-3-stable-ee
.
MRs picked
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4112#note_55092629
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4059
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3987
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3872
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3742
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3870
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3852
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3841
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3802
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3800
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3836
MR Filter for ~"Pick into 10.3" MRs
Note to leave in MRs
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4140, will merge into `10-3-stable-ee` ready for `10.3.5-ee`
/unlabel ~"Pick into 10.3"
Steps
- Cherry-pick commits into this MR using the link for ~"Pick into 10.3" above.
- This can be done by checking out
10-3-stable-ee-patch-5
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.3" label.
- If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the
10-3-stable-ee-patch-5
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.3" 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 Tiago Botelho