Skip to content

Prepare 11.0 RC7 EE release

Filipa Lacerda requested to merge 11-0-stable-ee-prepare-rc7 into 11-0-stable-ee

Main release issue: gitlab-org/release/tasks#243 (closed)

Summary

This MR prepares 11-0-stable-ee for %11.0 (RC7) by merging 11-0-stable-ee-prepare-rc7 into 11-0-stable-ee.

MR Filter for ~"Pick into 11.0" MRs

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

Note to leave in MRs

Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/MERGE_REQUEST_ID, will merge into `11-0-stable-ee` ready for `11.0 RC7 EE`

/unlabel ~"Pick into 11.0"

Steps

  1. Merge master up until code freeze
  2. Push changes every so often and verify that the MR has been included
  3. 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 11.0" label.
  1. If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the 11-0-stable-ee-prepare-rc7 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
  • Note: Often, after a release has been tagged, the VERSION file in ee will have a conflict. Accept the -ee one
  1. 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

  • Merge master up until code freeze
  • 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 Filipa Lacerda

Merge request reports