diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-05 13:32:07 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-05 13:32:07 +0000 |
| commit | 1521867219e9b51d8dc7be255b416e4830ab4566 (patch) | |
| tree | cff491bfd3572f69ecf667b9c1581ccc6b5dd95e /doc | |
| parent | 54d32f565e4ba8a8f8ba0642207204f42789289f (diff) | |
| parent | 90a308ea00ece729b15b430a397d22e3b3fe3102 (diff) | |
| download | gitlab-ce-1521867219e9b51d8dc7be255b416e4830ab4566.tar.gz | |
Merge branch 'release_docs_improvements' into 'master'
Release docs improvements
Fixes #1734
See merge request !1305
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/release/patch.md | 3 | ||||
| -rw-r--r-- | doc/release/security.md | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/release/patch.md b/doc/release/patch.md index ce5c2170302..2bd34b7d822 100644 --- a/doc/release/patch.md +++ b/doc/release/patch.md @@ -18,13 +18,14 @@ Otherwise include it in the monthly release and note there was a regression fix 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. Build the package for GitLab.com and do a deploy 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 1. In a separate commit in the stable branch update the 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" -### Bump version +### Bump version Get release tools diff --git a/doc/release/security.md b/doc/release/security.md index c24a394ef4a..b67e0f37a04 100644 --- a/doc/release/security.md +++ b/doc/release/security.md @@ -17,6 +17,7 @@ Please report suspected security vulnerabilities in private to <support@gitlab.c 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. Build the package for GitLab.com and do a deploy 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` |