diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-02-11 20:39:30 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-02-11 20:39:30 +0000 |
| commit | 49736c078e1529322d72eed6730493f9aedc3784 (patch) | |
| tree | ea092aea1add8d2c8138bcbac91989134e96f387 | |
| parent | 7ba1ff926f2c63f6f314d5e46e454e54480cf2d3 (diff) | |
| download | gitlab-ce-49736c078e1529322d72eed6730493f9aedc3784.tar.gz | |
Improvement to language on documentation to cherry-pick after freeze
| -rw-r--r-- | PROCESS.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/PROCESS.md b/PROCESS.md index 7728babde08..74b8440bc56 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -210,11 +210,11 @@ Once the stable branch is frozen, the only MRs that can be cherry-picked into the stable branch are: * Fixes for [regressions](#regressions) where the affected version `xx.x` in `regression:xx.x` is the current release. See [Managing bugs](#managing-bugs) section. -* Fixes for security issues -* Fixes or improvements to automated QA scenarios -* [Essential documentation improvements](https://docs.gitlab.com/ee/development/documentation/workflow.html) for changes in the same release -* New or updated translations (as long as they do not touch application code) -* Changes that are behind a feature flag and have the ~"feature flag" label +* Fixes for security issues. +* Fixes or improvements to automated QA scenarios. +* [Documentation improvements](https://docs.gitlab.com/ee/development/documentation/workflow.html) for feature changes made in the same release, though initial docs for these features should have already been merged by the freeze, as required. +* New or updated translations (as long as they do not touch application code). +* Changes that are behind a feature flag and have the ~"feature flag" label. During the feature freeze all merge requests that are meant to go into the upcoming release should have the correct milestone assigned _and_ the |