Prepare 11.5 RC9 release
Main release issue: gitlab-org/release/tasks#510 (closed)
Summary
This MR prepares 11-5-stable
for %11.5 (RC9
) by merging 11-5-stable-prepare-rc9
into 11-5-stable
.
Before the 7th
Merge master into the preparation branch
After the 7th
MR Filter for ~"Pick into 11.5" MRs
Note to leave in MRs
Picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/MERGE_REQUEST_ID, will merge into `11-5-stable` ready for `11.5 RC9`
/unlabel ~"Pick into 11.5"
Steps
- Perform automated cherry-picking to reduce the amount of manual picks required:
# In Slack
/chatops run cherry_pick 11.5.0-rc9
-
Cherry-pick remaining commits into this MR using the link for ~"Pick into 11.5" above.
- This can be done by checking out
11-5-stable-prepare-rc9
locally and usinggit cherry-pick -m1 MERGE_COMMIT_SHA
- Note: Copy the merge commit SHA from the "merged into
master
" section of the merge widget.
- This can be done by checking out
-
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 11.5" label.
-
If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the
11-5-stable-prepare-rc9
branch and assign it to the author of the conflicting files. -
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
-
Add changes into the preparation branches: - Before the 7th: Master has been merged into the preparation branch
- After the 7th: Changes marked ~"Pick into 11.5" have been picked
-
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.