diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-08-09 10:27:03 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-08-09 10:27:03 +0100 |
| commit | 94f163437f7e7d037d0d815de1922dd2258ef5ba (patch) | |
| tree | d6fa268aafc620e122da0655094560314beada8e /PROCESS.md | |
| parent | 02e9abc807e77cca8f85588db81e939d402a0d98 (diff) | |
| download | gitlab-ce-94f163437f7e7d037d0d815de1922dd2258ef5ba.tar.gz | |
Translations can be picked without asking for exceptions
Diffstat (limited to 'PROCESS.md')
| -rw-r--r-- | PROCESS.md | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/PROCESS.md b/PROCESS.md index 1669e1fa899..e5b17784d20 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -134,11 +134,18 @@ information, see ### After the 7th -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. -If the fixes are are completed on or after the 22nd, they will be shipped in a patch for that release. +Once the stable branch is frozen, the only MRs that can be cherry-picked into +the stable branch are: + +* Fixes for [regressions](#regressions) +* Fixes for security issues +* New or updated translations (as long as they do not touch application code) + +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. If the fixes are are +completed on or after the 22nd, they will be shipped in a patch for that +release. During the feature freeze all merge requests that are meant to go into the upcoming release should have the correct milestone assigned _and_ have the label |