diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-04 12:42:20 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-04 12:42:20 +0000 |
| commit | 8947e59d9191b9723dc2a49f75dd735b4f3d299c (patch) | |
| tree | fb1bfa5a54492cb0f7d84c750afe9af1840ed9c8 /PROCESS.md | |
| parent | 8091ec56d49ffb326f971672c71bd5d6af1c26f4 (diff) | |
| parent | aedce9e9ba71f3c9c190556183202fa675ce1be7 (diff) | |
| download | gitlab-ce-8947e59d9191b9723dc2a49f75dd735b4f3d299c.tar.gz | |
Merge branch 'mj/process-feature-freeze' into 'master'
Green pipeline for feature freeze PROCESS
See merge request gitlab-org/gitlab-ce!23809
Diffstat (limited to 'PROCESS.md')
| -rw-r--r-- | PROCESS.md | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/PROCESS.md b/PROCESS.md index 5aafbd33daf..f2eed5544fc 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -86,10 +86,13 @@ star, smile, etc.). Some good tips about code reviews can be found in our ## Feature freeze on the 7th for the release on the 22nd -After 7th at 23:59 (Pacific Time Zone) of each month, RC1 of the upcoming -release (to be shipped on the 22nd) is created and deployed to GitLab.com and -the stable branch for this release is frozen, which means master is no longer -merged into it. Merge requests may still be merged into master during this +After 7th at 23:59 (Pacific Time Zone) of each month, stable branch and RC1 +of the upcoming release (to be shipped on the 22nd) is created and deployed to GitLab.com. +The stable branch is frozen at the most recent "qualifying commit" on master. +A "qualifying commit" is one that is pushed before the feature freeze cutoff time +and that passes all CI jobs (green pipeline). + +Merge requests may still be merged into master during this period, but they will go into the _next_ release, unless they are manually cherry-picked into the stable branch. |