diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-10-02 13:59:16 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-10-02 13:59:16 +0300 |
| commit | 785d8dab51443d67b4547b6456a289e1823a5089 (patch) | |
| tree | c803c04fd134440e65a6bddab1b007bd631b6bcb /.gitlab | |
| parent | 863c6b516554a6ca2da3763d308bf24ff8c3f79c (diff) | |
Post security release resume push mirroring
Last time the issue didn't include push mirroring, so tags didn't end up
on dev.gitlab.org. That means that builds were failing. Adding it to the
issue here should fix that for the next security release.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/Security Release.md | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/.gitlab/issue_templates/Security Release.md b/.gitlab/issue_templates/Security Release.md index 92dc64ed7..e70cf7dce 100644 --- a/.gitlab/issue_templates/Security Release.md +++ b/.gitlab/issue_templates/Security Release.md @@ -115,6 +115,17 @@ As a sanity check, you can verify your repository only points to remotes in - [ ] There is a good chance the newly patched Gitaly master on `gitlab.com` will need to be used to patch the latest GitLab CE/EE. This will require running the regular release process on gitlab.com. + - [ ] Merge the stable branches for gitlab.com and dev.gitlab.org + 1. `git remote add gitlab.com git@gitlab.com:gitlab-org/gitaly.git` + 1. `git checkout X-Y-stable` + 1. `git fetch gitlab.com X-Y-stable` + 1. `git merge gitlab.com/X-Y-stable` + 1. `git push gitlab.com X-Y-stable` + 1. `git remote remove gitlab.com` + - [ ] Gitaly on GitLab.com uses push mirroring to dev.gitlab.com, if branches + are diverged this stops working. Go to `Settings > Repository > Mirroring repositories` + to update the mirror. When there's no error after the manual update, it will + resume normal operation. [gitaly-ce-version]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/GITALY_SERVER_VERSION [gitlab-sec-process]: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md |