diff options
| author | John Cai <jcai@gitlab.com> | 2019-04-25 04:42:29 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-04-25 04:42:29 +0300 |
| commit | 0bfbc3167a0b08bebd219eb5f0b9352f2faf458b (patch) | |
| tree | ab0792b828bead8f4e377a6bf9e0a40049b74a96 | |
| parent | 0a558654ef411e6df8c988e89a55d4cc00d84c3c (diff) | |
| parent | 6455e893c1bc6ca71b4b8b36854a139db0a0f405 (diff) | |
Merge branch 'sec-process' into 'master'
Sec process
See merge request gitlab-org/gitaly!1221
| -rw-r--r-- | doc/PROCESS.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/PROCESS.md b/doc/PROCESS.md index b68bc7a68..54c5a5f12 100644 --- a/doc/PROCESS.md +++ b/doc/PROCESS.md @@ -34,6 +34,14 @@ GITLAB_TOKEN=$(cat /path/to/gitlab-token) _support/update-downstream-server-vers - This will create a merge-request (with changelog) and assign it to you. Once the build has completed successfully, assign it to a maintainer for review. +##### Security release + +- Check what version of Gitaly you're backporting by opening [`GITALY_SERVER_VERSION`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/GITALY_SERVER_VERSION) +- Create a stable branch for this version: + - `git checkout vX.Y.Z`, then `git checkout -b X-Y-stable`, and push it to the main gitlab.com repository +- Create the required merge requests on `dev.gitlab.org`, making sure to bump `GITALY_SERVER_VERSION` on the client (gitlab-rails) in every backported merge request +- Follow the [usual security process](https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md) + ## Experimental builds Push the release tag to dev.gitlab.org/gitlab/gitaly. After the |