diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-09 21:46:38 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-09 21:46:38 +0300 |
| commit | 43890ed1dc0d6b4b3cf29116391f52246b4f6eae (patch) | |
| tree | 03c81ece2978177f51262d820b003cb58439b7f4 /doc/release | |
| parent | 026494029efebd411d597b3cc4c73f59f908012a (diff) | |
Update patch release document
Diffstat (limited to 'doc/release')
| -rw-r--r-- | doc/release/patch.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/release/patch.md b/doc/release/patch.md index 2bd34b7d822..d8bb4aef0e2 100644 --- a/doc/release/patch.md +++ b/doc/release/patch.md @@ -18,12 +18,13 @@ 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. In a separate commit in the master 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" +1. Merge CE stable branch into EE stable branch + ### Bump version @@ -48,9 +49,8 @@ CE=false be rake release['x.x.x'] ### Release -1. Apply the patch to GitLab Cloud and the private GitLab development server 1. [Build new packages with the latest version](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md) -1. Cherry-pick the changelog update back into master +1. Apply the patch to GitLab.com and the private GitLab development server 1. Create and publish a blog post -1. Send tweets about the release from `@gitlabhq`, tweet should include the most important feature that the release is addressing and link to the blog post +1. Send tweets about the release from `@gitlab`, tweet should include the most important feature that the release is addressing and link to the blog post 1. Note in the 'GitLab X.X regressions' issue that the patch was published (CE only) |