summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-31 15:19:41 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-31 15:19:41 +0000
commitfbd4b7ae7c1c8db09e4e3a67aad7844104c66f76 (patch)
treeb2085d41d2e772582cdf083a4de6d0cc7b2a76c8
parent0d52e59de40c4c0b50340ee72308f4de3e9d1c9a (diff)
parent38dc8c0c57cb880b52d20e13deac1fa6f8393d3e (diff)
downloadgitlab-ce-fbd4b7ae7c1c8db09e4e3a67aad7844104c66f76.tar.gz
Merge branch 'add-regressions-explanation' into 'master'
Explain what the regression label means Closes #35065 See merge request !13190
-rw-r--r--PROCESS.md20
1 files changed, 19 insertions, 1 deletions
diff --git a/PROCESS.md b/PROCESS.md
index 3b97a4e8c75..2b3d142bf77 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -128,7 +128,7 @@ information, see
### After the 7th
-Once the stable branch is frozen, only fixes for regressions (bugs introduced in that same release)
+Once the stable branch is frozen, only fixes for [regressions](#regressions)
and security issues will be cherry-picked into the stable branch.
Any merge requests cherry-picked into the stable branch for a previous release will also be picked into the latest stable branch.
These fixes will be shipped in the next RC for that release if it is before the 22nd.
@@ -158,6 +158,24 @@ release should have the correct milestone assigned _and_ have the label
Merge requests without a milestone and this label will
not be merged into any stable branches.
+### Regressions
+
+A regression for a particular monthly release is a bug that exists in that
+release, but wasn't present in the release before. This includes bugs in
+features that were only added in that monthly release. Every regression **must**
+have the milestone of the release it was introduced in - if a regression doesn't
+have a milestone, it might be 'just' a bug!
+
+For instance, if 10.5.0 adds a feature, and that feature doesn't work correctly,
+then this is a regression in 10.5. If 10.5.1 then fixes that, but 10.5.3 somehow
+reintroduces the bug, then this bug is still a regression in 10.5.
+
+Because GitLab.com runs release candidates of new releases, a regression can be
+reported in a release before its 'official' release date on the 22nd of the
+month. When we say 'the most recent monthly release', this can refer to either
+the version currently running on GitLab.com, or the most recent version
+available in the package repositories.
+
## Release retrospective and kickoff
### Retrospective