From e0c870c0451789318e46ff5cb2b44a8d7d555f4c Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 24 Nov 2014 12:14:07 +0100
Subject: [PATCH 1/3] The release manager handles all releases

---
 doc/release/monthly.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/release/monthly.md b/doc/release/monthly.md
index c50bfc21f8f..e81ee12af6c 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.
+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**
 

From 4e3bf439cba782bf7d3ea326f0f6f5878166f0e2 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 24 Nov 2014 12:14:19 +0100
Subject: [PATCH 2/3] Establish ownership of security releases

---
 doc/release/patch.md    | 1 +
 doc/release/security.md | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/release/patch.md b/doc/release/patch.md
index 6ed56427e9a..ce5c2170302 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 79d23c02ea4..a7fb57921df 100644
--- a/doc/release/security.md
+++ b/doc/release/security.md
@@ -14,7 +14,9 @@ Please report suspected security vulnerabilities in private to <support@gitlab.c
 
 1. Verify that the issue can be reproduced
 1. Acknowledge the issue to the researcher that disclosed it
+1. Inform the release manager that there needs to be a security release
 1. Do the steps from [patch release document](doc/release/patch.md), starting with "Create an issue on private GitLab development server"
+1. The MR with the security fix should get a 'security' label and be assigned to the release manager
 1. Create feature branches for the blog post on GitLab.com and link them from the code branch
 1. Merge and publish the blog posts
 1. Send tweets about the release from `@gitlabhq`

From a0a3eba1970cc6ea23cfdfe5750971215b2cafd2 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 24 Nov 2014 14:59:54 +0100
Subject: [PATCH 3/3] Explicitly mention patch releases

---
 doc/release/monthly.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release/monthly.md b/doc/release/monthly.md
index e81ee12af6c..64a8bc98344 100644
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
@@ -8,7 +8,7 @@ NOTE: This is a guide for GitLab developers.
 
 ### **2. Release Manager**
 
-A release manager is selected that coordinates all releases the coming month.
+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.