diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-10-04 10:27:36 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-10-04 10:27:36 +0300 |
| commit | 4fb437eaa72ca8ce5d305f253fbb2c62e41f6828 (patch) | |
| tree | 49f8c332c3221ec8254854baff80e1b3c62c29b7 | |
| parent | 6b748466dc0c885d100436d35636b730005d4d10 (diff) | |
| parent | 5b03f33d31544f573e9959b6ec59d4b76d621d26 (diff) | |
Merge branch 'po-security-process-tweaks' into 'master'
Iterate on security process
See merge request gitlab-org/gitaly!1486
| -rw-r--r-- | .gitlab/issue_templates/Security Release.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/issue_templates/Security Release.md b/.gitlab/issue_templates/Security Release.md index e70cf7dce..74bd350c4 100644 --- a/.gitlab/issue_templates/Security Release.md +++ b/.gitlab/issue_templates/Security Release.md @@ -17,7 +17,7 @@ GitLab at the correct times. | GitLab-CE Branch | Gitaly Tag/Branch | Gitaly MR | |------------------|-------------------|--------------------| -| `master` | `v1.Y.Z` | <MR link> | +| `master` | **TBD** | <MR link> | | `12.X` | `1-X-stable` | <backport MR link> | | `12.X` | `1-X-stable` | <backport MR link> | | `12.X` | `1-X-stable` | <backport MR link> | @@ -47,7 +47,7 @@ As a sanity check, you can verify your repository only points to remotes in the [version matrix](#version-matrix) above. - **Contributor**: Determine if Gitaly stable branches exist for all needed fixes. - - [ ] If all of them exist, mark the next section with a `[-]` to skip. + - [ ] If all of them exist, also mark the next section as complete and skip. Otherwise, reassign the maintainer to complete the next section. - **Maintainer:** If a Gitaly stable branch `X-Y-stable` in the [table above](#version-matrix) does not exist yet, perform the following steps in a repository cloned @@ -70,8 +70,8 @@ As a sanity check, you can verify your repository only points to remotes in 1. `git checkout X-Y-stable` 1. `git pull` 1. `_support/release X.Y.Z` (where `Z` is the new incremented patch version) - 1. Upon successful vetting of the release, the script will provide a - command for you to actually push the tag + 1. Upon successful vetting of the release, run `git push origin $TAGNAME` + for each tag. - Reassign to contributor - **Contributor:** Bump Gitaly in GitLab projects: - [ ] For each version of GitLab in the [table above](#version-matrix), |