Merge branch 'security-release-ownership' into 'master'

Security release ownership We saw the following problems around the 7.4.4 release: - the fix got merged into master while it should have been held back - there was a security fix but no release manager to release it With this change we want to improve our process and documentation to prevent situations like this in the future. See merge request !1273

Merge branch 'security-release-ownership' into 'master'
8a0abbb7 · Marin Jankovski · e7a3e355 · a0a3eba1 · 8a0abbb7 · 8a0abbb7
Commit 8a0abbb7 authored Nov 24, 2014 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

monthly.md doc/release/monthly.md +3 -1

patch.md doc/release/patch.md +1 -0

security.md doc/release/security.md +2 -0

No files found.
--- 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**


--- 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

--- 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`