diff options
| author | Steve Azzopardi <steveazz@outlook.com> | 2018-10-10 15:56:17 +0200 |
|---|---|---|
| committer | Steve Azzopardi <steveazz@outlook.com> | 2018-10-10 15:56:17 +0200 |
| commit | 9fc3b2355af0ef322007df96dc6bc42bf07ac675 (patch) | |
| tree | b72bfdd1652da55fbcd9fbe09a1e26d984aebefb /PROCESS.md | |
| parent | 1c51a6bed7e32c5379c475779288fc7f957093f8 (diff) | |
| download | gitlab-ce-9fc3b2355af0ef322007df96dc6bc42bf07ac675.tar.gz | |
Add allowance to merge feature flags MRs
After the 7th it is OK to merge code changes that are merged as long it
is behind a feature flag.
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 |