Commit 79f143c3f1e0a68023c7df4d993e8f5ac11e97d7
Exists in
spb-stable
and in
3 other branches
Merge branch 'monthly-process'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: doc/release/monthly.md
Showing
1 changed file
with
8 additions
and
10 deletions
Show diff stats
doc/release/monthly.md
| @@ -58,19 +58,17 @@ Check if changed since last release (~22nd of last month depending on when last | @@ -58,19 +58,17 @@ Check if changed since last release (~22nd of last month depending on when last | ||
| 58 | 58 | ||
| 59 | 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: | 59 | 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: |
| 60 | 60 | ||
| 61 | -* 17th: feature freeze (stop merging new features in master) | ||
| 62 | -* 18th: UI freeze (stop merging changes to the user interface) | ||
| 63 | -* 19th: code freeze (stop merging non-essential code improvements) | ||
| 64 | -* 20th: release candidate 1 (VERSION x.x.0.rc1, tag, tweet and upgrade Cloud) | ||
| 65 | -* 21st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems) | ||
| 66 | -* 22nd: release (VERSION x.x.0, create x-x-stable branch, tag, blog and tweet) | ||
| 67 | -* 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious regressions) | ||
| 68 | -* 24-end of month: release Enterprise Edition and upgrade GitLab Cloud to latest patch | ||
| 69 | * 1-7th: official merge window (see contributing guide) | 61 | * 1-7th: official merge window (see contributing guide) |
| 70 | -* 8-16th: bugfixes and sponsored features | 62 | +* 8-14th: work on bugfixes, sponsored features and GitLab EE |
| 63 | +* 15th: code freeze (stop merging into master except essential bugfixes) | ||
| 64 | +* 18th: release candidate 1 (VERSION x.x.0.rc1, tag and tweet about x.x.0.rc1, release on GitLab Cloud) | ||
| 65 | +* 20st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems) | ||
| 66 | +* 22nd: release (VERSION x.x.0, create x-x-stable branch, tag, blog and tweet) | ||
| 67 | +* 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems) | ||
| 68 | +* 24-end of month: release GitLab EE and GitLab CI | ||
| 71 | 69 | ||
| 72 | # Write a blog post | 70 | # Write a blog post |
| 73 | 71 | ||
| 74 | * Mention what GitLab is on the second line: GitLab is open source software to collaborate on code. | 72 | * Mention what GitLab is on the second line: GitLab is open source software to collaborate on code. |
| 75 | * Select and thank the the Most Valuable Person (MVP) of this release. | 73 | * Select and thank the the Most Valuable Person (MVP) of this release. |
| 76 | -* 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. | ||
| 77 | \ No newline at end of file | 74 | \ No newline at end of file |
| 75 | +* 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. |