diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-30 18:09:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-30 18:09:23 +0000 |
commit | c75a89181492dc8bc7cee96d3f6c3b9d1a65fb5b (patch) | |
tree | 7a0c2f217c51565503d80ee939e5001dfc47553e /doc | |
parent | 969ce9efdb76556eb69bb4daefdcf0982333686a (diff) | |
download | gitlab-ce-c75a89181492dc8bc7cee96d3f6c3b9d1a65fb5b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/policy/maintenance.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md index 7617d0c8881..ba561810fab 100644 --- a/doc/policy/maintenance.md +++ b/doc/policy/maintenance.md @@ -7,6 +7,11 @@ type: concepts GitLab has strict policies governing version naming, as well as release pace for major, minor, patch and security releases. New releases are usually announced on the [GitLab blog](https://about.gitlab.com/blog/categories/releases/). +Our current policy is: + +- Backporting bug fixes for **only the current stable release** at any given time, see [patch releases](#patch-releases). +- Backporting to **to the previous two monthly releases in addition to the current stable release**, see [security releases](#security-releases). + ## Versioning GitLab uses [Semantic Versioning](https://semver.org/) for its releases: @@ -30,8 +35,6 @@ The following table describes the version types and their release cadence: ## Patch releases -Our current policy is to support **only the current stable release** at any given time. - Patch releases **only include bug fixes** for the current stable released version of GitLab. @@ -97,10 +100,7 @@ To request backporting to more than one stable release for consideration, raise ### Security releases Security releases are a special kind of patch release that only include security -fixes and patches (see below). - -Our current policy is to backport security fixes to the previous two -monthly releases in addition to the current stable release. +fixes and patches (see below) for the previous two monthly releases in addition to the current stable release. For very serious security issues, there is [precedent](https://about.gitlab.com/blog/2016/05/02/cve-2016-4340-patches/) |