diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-24 14:55:39 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-24 14:55:39 +0200 |
| commit | 79f143c3f1e0a68023c7df4d993e8f5ac11e97d7 (patch) | |
| tree | e941289480e5277a9b7629b04ed4ae4ab1587720 /doc | |
| parent | 12d162993e6198df2ce62bf53e6b8182ca783fd5 (diff) | |
| parent | de5e41c67d1e0c2d4aa53fbe863a8b3f7e24f731 (diff) | |
| download | gitlab-ce-79f143c3f1e0a68023c7df4d993e8f5ac11e97d7.tar.gz | |
Merge branch 'monthly-process'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
doc/release/monthly.md
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/release/monthly.md | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/doc/release/monthly.md b/doc/release/monthly.md index e440f5d5abc..08149b4da86 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -58,19 +58,17 @@ 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 (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.rc1, tag, tweet and upgrade Cloud) -* 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 regressions) -* 24-end of month: release Enterprise Edition and upgrade GitLab Cloud to latest patch * 1-7th: official merge window (see contributing guide) -* 8-16th: bugfixes and sponsored features +* 8-14th: work on bugfixes, sponsored features and GitLab EE +* 15th: code freeze (stop merging into master except essential bugfixes) +* 18th: release candidate 1 (VERSION x.x.0.rc1, tag and tweet about x.x.0.rc1, release on GitLab Cloud) +* 20st: 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) +* 24-end of month: release GitLab EE and GitLab CI # Write a blog post * Mention what GitLab is on the second line: GitLab is open source software to collaborate on code. * Select and thank the the Most Valuable Person (MVP) of this release. -* Add a note if there are security fixes: This release fixes an important security issue and we advise everyone to upgrade as soon as possible.
\ No newline at end of file +* Add a note if there are security fixes: This release fixes an important security issue and we advise everyone to upgrade as soon as possible. |