diff --git a/doc/release/monthly.md b/doc/release/monthly.md index c50bfc21f8..64a8bc9834 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -8,7 +8,9 @@ NOTE: This is a guide for GitLab developers. ### **2. Release Manager** -A release manager is selected that coordinates the entire release of this version. The release manager has to make sure all the steps below are done and delegated where necessary. This person should also make sure this document is kept up to date and issues are created and updated. +A release manager is selected that coordinates all releases the coming month, including the patch releases for previous releases. +The release manager has to make sure all the steps below are done and delegated where necessary. +This person should also make sure this document is kept up to date and issues are created and updated. ### **3. Create an overall issue** diff --git a/doc/release/patch.md b/doc/release/patch.md index 6ed56427e9..ce5c217030 100644 --- a/doc/release/patch.md +++ b/doc/release/patch.md @@ -17,6 +17,7 @@ Otherwise include it in the monthly release and note there was a regression fix 1. Create an issue on private GitLab development server 1. Name the issue "Release X.X.X CE and X.X.X EE", this will make searching easier 1. Fix the issue on a feature branch, do this on the private GitLab development server +1. If it is a security issue, then assign it to the release manager and apply a 'security' label 1. Consider creating and testing workarounds 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch 1. Make sure that the build has passed and all tests are passing diff --git a/doc/release/security.md b/doc/release/security.md index 79d23c02ea..a7fb57921d 100644 --- a/doc/release/security.md +++ b/doc/release/security.md @@ -14,7 +14,9 @@ Please report suspected security vulnerabilities in private to