Commit 1dab2939 authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'mj/feature-freeze-process' into 'master'

Change the feature freeze details

See merge request gitlab-org/gitlab-ce!29548
parents 4716cae4 f3c34cde
...@@ -86,21 +86,12 @@ star, smile, etc.). Some good tips about code reviews can be found in our ...@@ -86,21 +86,12 @@ 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 ## Feature freeze on the 7th for the release on the 22nd
After 7th at 23:59 (Pacific Time Zone) of each month, stable branch and RC1 The feature freeze on the 7th has been discontinued. [Transition period overview]
of the upcoming release (to be shipped on the 22nd) is created and deployed to GitLab.com. describes the change to this process. During the transition period, the only guarantee that
The stable branch is frozen at the most recent "qualifying commit" on master. a change will be included in the release on the 22nd is if the change has been
A "qualifying commit" is one that is pushed before the feature freeze cutoff time deployed to GitLab.com prior to this date.
and that passes all CI jobs (green pipeline).
Merge requests may still be merged into master during this [Transition period]: https://gitlab.com/gitlab-org/release/docs/blob/21cbd409dd5f157fe252f254f3e897f01908abe2/general/deploy/auto-deploy-transition.md#transition
period, but they will go into the _next_ release, unless they are manually
cherry-picked into the stable branch.
By freezing the stable branches 2 weeks prior to a release, we reduce the risk
of a last minute merge request potentially breaking things.
Any release candidate that gets created after this date can become a final
release, hence the name release candidate.
### Feature flags ### Feature flags
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment