diff options
author | dosire <sytses@gmail.com> | 2014-01-24 09:14:28 +0100 |
---|---|---|
committer | dosire <sytses@gmail.com> | 2014-01-24 09:14:35 +0100 |
commit | f89df5b496b3d2f64c9c7493848755c5baad46f4 (patch) | |
tree | e378c2bc7f314dbb409794dd451855b0ad37ba93 /doc/release | |
parent | 2adbc0b778985ee6b0a78b5acd845904520ccc64 (diff) | |
download | gitlab-ce-f89df5b496b3d2f64c9c7493848755c5baad46f4.tar.gz |
Do not branch from master until release is done.
Diffstat (limited to 'doc/release')
-rw-r--r-- | doc/release/monthly.md | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/release/monthly.md b/doc/release/monthly.md index bad7794d421..17f69915d10 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -58,12 +58,13 @@ Check if changed since last release (~22nd of last month depending on when last After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows: -* 17th: feature freeze (branch and stop merging new features) -* 18th: UI freeze (stop cherry-picking changes to the user interface) -* 19th: code freeze (stop cherry-picking non-essential code improvements) -* 20th: release candidate 1 (tag and tweet about x.x.rc1) -* 21st: release candidate 2 (optional, only if rc1 had problems) -* 22nd: release (update VERSION and CHANGELOG, tag, blog and tweet) +* 17th: feature freeze (stop merging new features in master) +* 18th: UI freeze (stop merging changes to the user interface) +* 19th: code freeze (stop merging non-essential code improvements) +* 20th: release candidate 1 (VERSION x.x.0.pre, tag and tweet about x.x.0.rc1) +* 21st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems) +* 22nd: release (VERSION x.x.0, create x-x-stable branch, tag, blog and tweet) +* 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems) # Write a blog post |