From 915fd794b7c7f3ad2c3ea146d0bb00d8be3fb2c0 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreir <oswaldo@gitlab.com> Date: Wed, 16 Jan 2019 20:06:55 +0000 Subject: [PATCH 1/5] Update MAINTENANCE.md --- MAINTENANCE.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 1efb2a35f6d..1efb3aa8c5c 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -9,12 +9,12 @@ GitLab follows the [Semantic Versioning](http://semver.org/) for its releases: to the public API or a minor feature is introduced, or when a set of smaller features is rolled out. - **Patch number**: When backwards compatible bug fixes are introduced that fix - incorrect behavior. + incorrect behavior The current stable release will receive security patches and bug fixes (eg. `8.9.0` -> `8.9.1`). Feature releases will mark the next supported stable release where the minor version is increased numerically by increments of one -(eg. `8.9 -> 8.10`). +(eg. `8.9 -> 8.10`) Our current policy is to support one stable release at any given time, but for medium-level security issues, we may consider [backporting to the previous two @@ -29,6 +29,12 @@ More information about the release procedures can be found in our [release-tools documentation][rel]. You may also want to read our [Responsible Disclosure Policy][disclosure]. + +something + + +something + [rel-sec]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/security.md#backporting [rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/ [disclosure]: https://about.gitlab.com/disclosure/ -- GitLab From 49b45f5b0fc77e56e07ae6c1fadf706fbeff14ce Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreir <oswaldo@gitlab.com> Date: Wed, 16 Jan 2019 20:07:40 +0000 Subject: [PATCH 2/5] Apply suggestion to MAINTENANCE.md --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 1efb3aa8c5c..4ff808a5162 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -37,5 +37,5 @@ something [rel-sec]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/security.md#backporting [rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/ -[disclosure]: https://about.gitlab.com/disclosure/ +[disclosure]: https://about.gitlab.com/disclosure/x [pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e -- GitLab From 62ee978fe622a8477a5a7463d4dbd0ab8db7ad28 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreir <oswaldo@gitlab.com> Date: Wed, 16 Jan 2019 20:07:58 +0000 Subject: [PATCH 3/5] Apply suggestion to MAINTENANCE.md --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 4ff808a5162..c9185b254cf 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -30,7 +30,7 @@ More information about the release procedures can be found in our [Responsible Disclosure Policy][disclosure]. -something +something x something -- GitLab From 8caf354a9fa2ca9d70304a04fee6a682ead3be8f Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreir <oswaldo@gitlab.com> Date: Tue, 9 Apr 2019 17:37:34 +0000 Subject: [PATCH 4/5] Apply suggestion to MAINTENANCE.md --- MAINTENANCE.md | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index c9185b254cf..4a8803bd030 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -1,25 +1,6 @@ -# GitLab Maintenance Policy - -GitLab follows the [Semantic Versioning](http://semver.org/) for its releases: -`(Major).(Minor).(Patch)` in a [pragmatic way]. - -- **Major version**: Whenever there is something significant or any backwards - incompatible changes are introduced to the public API. -- **Minor version**: When new, backwards compatible functionality is introduced - to the public API or a minor feature is introduced, or when a set of smaller - features is rolled out. -- **Patch number**: When backwards compatible bug fixes are introduced that fix incorrect behavior - -The current stable release will receive security patches and bug fixes -(eg. `8.9.0` -> `8.9.1`). Feature releases will mark the next supported stable -release where the minor version is increased numerically by increments of one -(eg. `8.9 -> 8.10`) - -Our current policy is to support one stable release at any given time, but for -medium-level security issues, we may consider [backporting to the previous two -monthly releases][rel-sec]. - + foo + bar We encourage everyone to run the latest stable release to ensure that you can easily upgrade to the most secure and feature-rich GitLab experience. In order to make sure you can easily run the most recent stable release, we are working -- GitLab From ecddb77eb916ce65512a98a0479f4bddcb9acc96 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreir <oswaldo@gitlab.com> Date: Tue, 9 Apr 2019 17:40:43 +0000 Subject: [PATCH 5/5] Apply suggestion to MAINTENANCE.md --- MAINTENANCE.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 4a8803bd030..7c338130b6d 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -1,22 +1,4 @@ incorrect behavior foo bar -We encourage everyone to run the latest stable release to ensure that you can -easily upgrade to the most secure and feature-rich GitLab experience. In order -to make sure you can easily run the most recent stable release, we are working -hard to keep the update process simple and reliable. - -More information about the release procedures can be found in our -[release-tools documentation][rel]. You may also want to read our -[Responsible Disclosure Policy][disclosure]. - - -something x - - -something - -[rel-sec]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/security.md#backporting -[rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/ -[disclosure]: https://about.gitlab.com/disclosure/x [pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e -- GitLab