Download as
Browse Code »

Commit c927f0620a85a5b43e76d0fdd0a7d276ba9e44aa

Authored by Marin Jankovski
1 parent f7d2f360
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Update security document with the link to patch document.

Showing 2 changed files with 2 additions and 7 deletions   Show diff stats
doc/release/patch.md
  Diff comments   View file @c927f06
@@ -12,6 +12,7 @@ Otherwise include it in the monthly release and note there was a regression fix @@ -12,6 +12,7 @@ Otherwise include it in the monthly release and note there was a regression fix
12 1. Create an issue on private GitLab development server 12 1. Create an issue on private GitLab development server
13 1. Name the issue "Release X.X.X CE and X.X.X EE", this will make searching easier 13 1. Name the issue "Release X.X.X CE and X.X.X EE", this will make searching easier
14 1. Fix the issue on a feature branch, do this on the private GitLab development server 14 1. Fix the issue on a feature branch, do this on the private GitLab development server
  15 +1. Consider creating and testing workarounds
15 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch 16 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch
16 1. In a separate commit in the stable branch, update the VERSION and CHANGELOG 17 1. In a separate commit in the stable branch, update the VERSION and CHANGELOG
17 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" 18 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"
doc/release/security.md
  Diff comments   View file @c927f06
@@ -13,14 +13,8 @@ Please report suspected security vulnerabilities in private to support@gitlab.co @@ -13,14 +13,8 @@ Please report suspected security vulnerabilities in private to support@gitlab.co
13 13
14 1. Verify that the issue can be repoduced 14 1. Verify that the issue can be repoduced
15 1. Acknowledge the issue to the researcher that disclosed it 15 1. Acknowledge the issue to the researcher that disclosed it
16 -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  
17 -1. Consider creating and testing workarounds 16 +1. Do the steps from [patch release document](doc/release/patch.md), starting with "Create an issue on private GitLab development server"
18 1. Create feature branches for the blog post on GitLab.com and link them from the code branch 17 1. Create feature branches for the blog post on GitLab.com and link them from the code branch
19 -1. Merge the code feature branch into master  
20 -1. Cherry-pick the code into the latest stable branch  
21 -1. Create an annotated tag vX.X.X for CE and another patch release for EE  
22 -1. Push the code and the tags to all the CE and EE repositories  
23 -1. Apply the patch to GitLab Cloud and the private GitLab development server  
24 1. Merge and publish the blog posts 18 1. Merge and publish the blog posts
25 1. Send tweets about the release from @gitlabhq 19 1. Send tweets about the release from @gitlabhq
26 1. Send out an email to the subscribers mailing list on MailChimp 20 1. Send out an email to the subscribers mailing list on MailChimp