Prepare 11.7.5 release
Release issue: gitlab-org/release/tasks#659 (closed)
Summary
This MR prepares 11-7-stable
for 11.7.5
.
Before the 7th
Merge master into the preparation branch.
After the 7th
MR Filter for ~"Pick into 11.7" MRs
Note to leave in MRs
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"
Steps
-
Cherry-pick remaining commits into this MR using the link for ~"Pick into 11.7" above.
- This can be done by checking out
11-7-stable-patch-5
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.7" label.
-
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
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.7" 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.
Merge request reports
Activity
changed milestone to %11.7
mentioned in issue gitlab-org/release/tasks#659 (closed)
added 1 commit
- 51cae079 - Merge branch '56213-remove-error_tracking-feature-flag' into 'master'
mentioned in merge request !24306 (merged)
added 1 commit
- 46108ee1 - Merge branch 'docs/default-rbac' into 'master'
mentioned in merge request !24445 (merged)
mentioned in merge request !24465 (merged)
added 1 commit
- 54414d74 - Merge branch 'qa/testing/cng/189' into 'master'
mentioned in merge request !24477 (merged)
added 1 commit
- 481532c8 - Merge branch 'docs/private-project-go-package' into 'master'
mentioned in merge request !24495 (merged)
added 1 commit
- 612a42aa - Merge branch '56254-follow-up-from-change-update-instructions-for-node-from-6-to-8' into 'master'
mentioned in merge request !24499 (merged)
added 1 commit
- 6e7c13a8 - Merge branch 'sh-remove-bitbucket-mirror-constant' into 'master'
mentioned in merge request !24510 (merged)
added 1 commit
- c64e61fa - Merge branch 'sh-fix-issue-56225' into 'master'
added 1 commit
- 755f52ba - Merge branch 'update-errortracking-118-docs' into 'master'
mentioned in merge request !24528 (merged)
mentioned in merge request !24533 (merged)
added 1 commit
- 10a4b4f2 - Merge branch 'osw-adjusts-suggestions-unable-to-be-applied' into 'master'
mentioned in merge request !24603 (merged)
added 1 commit
- 5b561b50 - Merge branch 'sh-fix-issue-9357' into 'master'
mentioned in merge request !24615 (merged)
added 1 commit
- 4f57b0c6 - Merge branch 'support-CNG-mirror-2-ce' into 'master'
mentioned in merge request !24639 (merged)
mentioned in merge request !24645 (merged)
added 1 commit
- c51b7f8e - Merge branch '56424-fix-gl-form-init-tag-editing' into 'master'
added 1 commit
- 666d5b7f - Merge branch 'qa-ml-quarantine-diff-patch-spec' into 'master'
mentioned in merge request !24769 (merged)
added 1 commit
- 2771d97b - Merge branch 'ee-1979-blobs-at' into 'master'
mentioned in merge request !24859 (merged)
added 1 commit
- f8671e4c - Merge branch 'sh-fix-oauth2-callback-caps' into 'master'
mentioned in merge request !24877 (merged)
added 1 commit
- e14b27bb - Merge branch 'sh-fix-detect-host-keys' into 'master'
mentioned in merge request !24884 (merged)
added 1 commit
- 694124db - Merge branch 'fj-regression-external-wiki-url' into 'master'
Successfully picked the following merge requests:
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24306
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24445
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24465
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24477
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24495
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24499
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24510
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24528
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24533
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24603
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24615
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24639
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24645
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24769
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24859
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24877
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24884
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24907
Failed to pick the following merge requests:
mentioned in merge request !24907 (merged)
1 Error Merge request ID was not set to 24941! See the documentation. 4 Warnings Most of the time, merge requests should target master
. Otherwise, please set the relevantPick into X.Y
label.This merge request is quite big (more than 599 lines changed), please consider splitting it into multiple merge requests. This merge request is missing the ~Documentation label. This merge request includes more than 10 commits. Please rebase these commits into a smaller number of commits. 1 Message This merge request adds or changes files that require a review from the Docs team. Docs review
The following files require a review from the Documentation team:
doc/update/11.6-to-11.7.md
doc/user/project/clusters/index.md
doc/user/project/index.md
doc/user/project/integrations/prometheus_library/index.md
doc/user/project/integrations/prometheus_library/nginx_ingress.md
doc/user/project/integrations/prometheus_library/nginx_ingress_vts.md
doc/user/project/operations/error_tracking.md
When your content is ready for review, assign the MR to a technical writer according to the DevOps stages in the table below. If necessary, mention them in a comment explaining what needs to be reviewed.
Tech writer Stage(s) @marcia
~Create ~Release + development guidelines @axil
~Distribution Gitaly ~Gitter ~Monitoring ~Package ~Secure @eread
~Manage ~Configure ~Geo ~Verify @mikelewis
~Plan You are welcome to mention them sooner if you have questions about writing or updating the documentation. GitLabbers are also welcome to use the #docs channel on Slack.
If you are not sure which category the change falls within, or the change is not part of one of these categories, mention one of the usernames above.
Generated by
DangerEdited by 🤖 GitLab Bot 🤖added 1 commit
- c28360c5 - Merge branch '56473-update-nginx-docs' into 'master'
mentioned in merge request !24449 (merged)
mentioned in commit 508430d6
added teamDelivery label