Skip to content

WIP: Prepare 9.5.6-ee release

Jose Ivan Vargas Lopez requested to merge 9-5-stable-ee-patch-6 into 9-5-stable-ee

Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38529

Summary

This MR prepares 9-5-stable-ee for %9.5 (9.5.6-ee) by merging 9-5-stable-ee-patch-6 into 9-5-stable-ee.

MR Filter for Pick into Stable MRs

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+Stable&milestone_title=9.5&scope=all&sort=updated_asc&state=merged

MR Filter for Pick into Backports MRs

As well as picking merge requests explicitly marked for this release, you'll need to check those which need to be included in backports. Some Pick into Backports MRs won't be relevant for this release, or will have already been included; because of this you'll need to read the discussion on each MR below to decide if to include them:

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+Backports&scope=all&sort=updated_asc&state=merged

Note to leave in MRs

Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3031, will merge into `9-5-stable-ee` ready for `9.5.6-ee`

/unlabel ~"Pick into Backports"

Steps

  1. Cherry-pick commits into this MR using the links for Pick into Stable and Pick into Backports above.
  • This can be done by checking out 9-5-stable-ee-patch-6 locally and using git cherry-pick -m1 MERGE_COMMIT_SHA
  1. Push changes every so often and verify that the MR has been included
  2. Leave a note in the MR so others can easily see that it is on track to be included in a release.
  • If the MR no longer needs to be cherry-picked into further releases, remove the Pick into Stable label.
  • Otherwise update the milestone to the highest release it needs to be picked into, and set Pick into Backports if it needs to be picked into other releases in addition to that one.
  1. If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the 9-5-stable-ee-patch-6 branch and assign it to the author of the conflicting files.
  2. Merge CE-to-EE using one of the workflows described in the Merge CE stable changes to EE docs
  3. 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 Stable have been picked
  • Changes marked Pick into Backports 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 Jose Ivan Vargas Lopez

Merge request reports