From c927f0620a85a5b43e76d0fdd0a7d276ba9e44aa Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 14 Apr 2014 09:06:42 +0200 Subject: [PATCH] Update security document with the link to patch document. --- doc/release/patch.md | 1 + doc/release/security.md | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/doc/release/patch.md b/doc/release/patch.md index dc9cce55d98..30bb39b4e49 100644 --- a/doc/release/patch.md +++ b/doc/release/patch.md @@ -12,6 +12,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. Consider creating and testing workarounds 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch 1. In a separate commit in the stable branch, update the VERSION and CHANGELOG 1. For EE, update the CHANGELOG-EE if it is EE specific fix. Otherwise, merge the stable CE branch and add to CHANGELOG-EE "Merge community edition changes for version X.X.X" diff --git a/doc/release/security.md b/doc/release/security.md index 56a44b5d1da..2fe0a948ad2 100644 --- a/doc/release/security.md +++ b/doc/release/security.md @@ -13,14 +13,8 @@ Please report suspected security vulnerabilities in private to support@gitlab.co 1. Verify that the issue can be repoduced 1. Acknowledge the issue to the researcher that disclosed it -1. Fix the issue on a feature branch, do this on the private GitLab development server and update the VERSION and CHANGELOG in this branch -1. Consider creating and testing workarounds +1. Do the steps from [patch release document](doc/release/patch.md), starting with "Create an issue on private GitLab development server" 1. Create feature branches for the blog post on GitLab.com and link them from the code branch -1. Merge the code feature branch into master -1. Cherry-pick the code into the latest stable branch -1. Create an annotated tag vX.X.X for CE and another patch release for EE -1. Push the code and the tags to all the CE and EE repositories -1. Apply the patch to GitLab Cloud and the private GitLab development server 1. Merge and publish the blog posts 1. Send tweets about the release from @gitlabhq 1. Send out an email to the subscribers mailing list on MailChimp