diff options
| author | Victor Wu <victor@gitlab.com> | 2017-04-17 18:23:24 +0000 |
|---|---|---|
| committer | Victor Wu <victor@gitlab.com> | 2017-04-17 18:23:24 +0000 |
| commit | 41bc820bde661729a3033c7b3680481e82e131e4 (patch) | |
| tree | c74c428a687917983aac347447c26f031adfe0d6 /PROCESS.md | |
| parent | 7ac55b37338b5c9cd38de86c33455756b32dbd34 (diff) | |
| download | gitlab-ce-41bc820bde661729a3033c7b3680481e82e131e4.tar.gz | |
Update wording.high-priority-features-in-patch-releases
Diffstat (limited to 'PROCESS.md')
| -rw-r--r-- | PROCESS.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PROCESS.md b/PROCESS.md index 483aeaec266..fac3c22e09f 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -119,8 +119,8 @@ information, see Once the stable branch is frozen, only fixes for regressions (bugs introduced in that same release) 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 if it is before the upcoming release. -If the fixes are are completed by after the 22nd, they will be shipped in a patch for that release. +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. If you think a merge request should go into an RC or patch even though it does not meet these requirements, you can ask for an exception to be made. Exceptions require sign-off from 3 people besides the developer: |