Project 'gitlab-org/gitlab-ce' was moved to 'gitlab-org/gitlab-foss'. Please update any links and bookmarks that may still have the old path.
Prepare 11.7.5 release
Compare changes
+ 4
− 1
@@ -2,7 +2,10 @@
Release issue: gitlab-org/release/tasks#659 (closed)
This MR prepares 11-7-stable
for 11.7.5
.
Merge master into the preparation branch.
Picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/MERGE_REQUEST_ID, will merge into `11-7-stable` ready for `11.7.5`.
/unlabel ~"Pick into 11.7"
Cherry-pick remaining commits into this MR using the link for ~"Pick into 11.7" above.
11-7-stable-patch-5
locally and using git cherry-pick -m1 MERGE_COMMIT_SHA
master
" section of the merge widget.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.
If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the 11-7-stable-patch-5
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