diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-06-04 20:36:39 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-06-04 20:36:39 +0300 |
| commit | bd1b562e4b64a084b421bdeffb87eb6936592ca4 (patch) | |
| tree | 149205e37697dadbb3aa82d00835b89aacfc1605 | |
| parent | 43bd39ba6f5162be872e1e0c1b4a65fcf1377ca5 (diff) | |
Notes from running security release
| -rw-r--r-- | doc/PROCESS.md | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/PROCESS.md b/doc/PROCESS.md index 0edfc148a..80e7600aa 100644 --- a/doc/PROCESS.md +++ b/doc/PROCESS.md @@ -81,8 +81,9 @@ As a sanity check, you can verify your repository only points to remotes in 1. **Contributors:** Merge in your request against master on dev.gitlab.com 1. **Maintainers:** Bring gitlab.com up to sync with dev.gitlab.org: 1. `git remote add gitlab.com git@gitlab.com:gitlab-org/gitaly.git` - 1. `git checkout -b gitlab.com/master` - 1. `git merge dev/master` + 1. `git fetch gitlab.com` + 1. `git checkout -b gitlab-com-master gitlab.com/master` + 1. `git merge origin/master` (note: in this repo, origin points to dev.gitlab.org) 1. `git push gitlab.com master` 1. If the push fails, try running `git pull gitlab.com master` and then try the push again. @@ -92,6 +93,10 @@ As a sanity check, you can verify your repository only points to remotes in 1. `git push gitlab.com vX.Y.Z` (repeat for each tag) 1. `git remote remove gitlab.com` 1. Ensure no origins exist that point to gitlab.com: `git remote -v` + 1. **Maintainers:** 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](#creating-a-release) + on gitlab.com. [gitaly-ce-version]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/GITALY_SERVER_VERSION |