Merging release-13-9

Overview

TL/DR: For 13.9 master will be merged into release-13-9 on Sunday 21st. The bugs.yml (and /releases/2021/02/22/gitlab-13-9-released/#bug-fixes) file should to be manually checked before merge on the 22nd.

Background

On the 22nd we need to merge the release-13-9 branch into master. In previous months there have been conflicts when doing this directly, with or without a /rebase first. This month we decided we would checkout and merge master into the branch first.

Testing

Changes were tested on copies of the release-13-9 branch. There is also a backup of the branch with no changes.

• !75485 (closed) a copy of the release post branch at 1688fcec (clarifies 'partial' availability with maintenance mode) with no additional changes
• !75483 (closed) a copy with a /rebase in the UI that failed due to a conflict with bugs.yml
• !75482 (merged) a copy with master merged in locally used for verifying changes and merged into a copy of master

Note the branch https://gitlab.com/gitlab-com/www-gitlab-com/-/commits/master-for-rp-13-9 was a copy of master at 1e80789f, used to verify we can merge the updated release post into from test MR !75482 (merged)

Changes to release-13-9

• Master will be merged into release-13-9

Cleanup

• After the 22nd, @pcalder to cleanup test branches / merge requests and close this issue