diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-16 22:39:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-16 22:39:33 +0000 |
| commit | a706b3735ef01072401dd1ee67ba0586a2fdf61c (patch) | |
| tree | cd16c664e7c0a207c8a2cc7ff0c97d6e5c619b92 /PROCESS.md | |
| parent | 90056ed25b547537b02b29715e6153d3aab4cc79 (diff) | |
| parent | 68eafa50e925ac6da60d84a67884c53c13552315 (diff) | |
| download | gitlab-ce-a706b3735ef01072401dd1ee67ba0586a2fdf61c.tar.gz | |
Merge branch 'master' into 'dm-document-role-maintainer'
# Conflicts:
# doc/development/code_review.md
Diffstat (limited to 'PROCESS.md')
| -rw-r--r-- | PROCESS.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/PROCESS.md b/PROCESS.md index 38ec01f9de0..5fc2c4cf1df 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -208,6 +208,7 @@ the stable branch are: * Fixes or improvements to automated QA scenarios * [Documentation updates](https://docs.gitlab.com/ee/development/documentation/workflow.html#documentation-shipped-late) 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 During the feature freeze all merge requests that are meant to go into the upcoming release should have the correct milestone assigned _and_ the |