From cd811c6bbdce7ac27370854c0f44a23c2a804f6e Mon Sep 17 00:00:00 2001 From: Vitor Meireles De Sousa <5054702-vdesousa@users.noreply.gitlab.com> Date: Wed, 2 Sep 2020 13:26:37 +0000 Subject: [PATCH 1/2] Update security-engineer.md --- general/security/security-engineer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/security/security-engineer.md b/general/security/security-engineer.md index 566282c8..6b773ade 100644 --- a/general/security/security-engineer.md +++ b/general/security/security-engineer.md @@ -134,7 +134,7 @@ publishing: * Release manager starts publishing the packages * **When the packages are ready to be merged by the Release Team into master branch:** create an MR with the blog post file in https://gitlab.com/gitlab-com/www-gitlab-com. - * Destination Directory: `source/releases/posts` by copying the blog post MR that was prepared on `dev.gitlab.org`. + * Destination Directory: `sites/marketing/source/releases/posts` by copying the blog post MR that was prepared on `dev.gitlab.org`. * The file name should be in the format **`YYYY-MM-DD-security-release-gitlab-X.X.X.released.html.md`** * Put the link of the new blog post in the email notification request issue as well as the security release issue * Make sure the CVE IDs are documented in the corresponding GitLab.com issues and H1 reports -- GitLab From b3051d48c7a4c88b6018727de3d49bbcf4f7b7e1 Mon Sep 17 00:00:00 2001 From: Vitor Meireles De Sousa <5054702-vdesousa@users.noreply.gitlab.com> Date: Wed, 2 Sep 2020 13:48:18 +0000 Subject: [PATCH 2/2] Update security process following this release and small changes that were noticed. --- general/security/security-engineer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/security/security-engineer.md b/general/security/security-engineer.md index 6b773ade..f4927c90 100644 --- a/general/security/security-engineer.md +++ b/general/security/security-engineer.md @@ -130,7 +130,7 @@ by going to `0.0.0.0:80` in your browser. #### Finalize release Once blog post on dev.gitlab.org has been reviewed and all packages are ready for -publishing: +publishing (the status can be checked in `https://gitlab.com/gitlab-org/release/tasks/-/issues` or in the [slack channel](https://gitlab.slack.com/archives/C0139MAV672)): * Release manager starts publishing the packages * **When the packages are ready to be merged by the Release Team into master branch:** create an MR with the blog post file in https://gitlab.com/gitlab-com/www-gitlab-com. -- GitLab