diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-06-19 15:27:39 +0000 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-06-19 15:27:39 +0000 |
| commit | dc31dac219a2b7c4ceb390005d8b48dec8904a5b (patch) | |
| tree | d3d4ffe58d1db802c941722bf209b243f6d90435 /PROCESS.md | |
| parent | 3e5899ad9839d3ef8a920da8b6948ba4d0fa2c06 (diff) | |
| parent | 9092e96abc165ccd76d5b54fcd507c8c989b99ec (diff) | |
| download | gitlab-ce-dc31dac219a2b7c4ceb390005d8b48dec8904a5b.tar.gz | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'PROCESS.md')
| -rw-r--r-- | PROCESS.md | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/PROCESS.md b/PROCESS.md index f206506f7c5..a46fd8c25b4 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -168,6 +168,8 @@ the stable branch are: * Fixes for [regressions](#regressions) * Fixes for security issues +* Fixes or improvements to automated QA scenarios +* Documentation updates for changes in the same release * New or updated translations (as long as they do not touch application code) During the feature freeze all merge requests that are meant to go into the @@ -184,11 +186,7 @@ next patch release. If a merge request is to be picked into more than one release it will need one `Pick into X.Y` label per release where the merge request should be back-ported -to. - -For example, if the current patch release is `10.1.1` and a regression fix needs -to be backported down to the `9.5` release, you will need to assign it the -`10.1` milestone and the following labels: +to. For example: - `Pick into 10.1` - `Pick into 10.0` |