diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-10-20 11:19:18 +0000 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-10-20 11:19:18 +0000 |
| commit | 2164927f7e934c736e5c91b4216f97375e2ad131 (patch) | |
| tree | 43425829783fa6fe5cd1b9b7fcec792f2981b540 | |
| parent | a310a638db037d3914cf12e580c7a41209d2d06e (diff) | |
| download | gitlab-ce-winh-allow-picking-codestyle-changes.tar.gz | |
Allow code style changes to be picked in stable brancheswinh-allow-picking-codestyle-changes
| -rw-r--r-- | PROCESS.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/PROCESS.md b/PROCESS.md index 5fc2c4cf1df..f41f063323c 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -209,6 +209,8 @@ the stable branch are: * [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 +* Merge request that reduce the effort for picking regression fixes (such as code style changes) as long as they don't contain new functionality. + Keep in mind that instead of picking additional dependencies, **not** picking the corresponding regression fix is an option. During the feature freeze all merge requests that are meant to go into the upcoming release should have the correct milestone assigned _and_ the |