diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-10-22 12:49:00 +0000 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-10-22 12:49:00 +0000 |
| commit | a7f4692d5c3c6a6ea646529e4afc1e3a6916a555 (patch) | |
| tree | fa63dae2fcada467947d6fd29254408cec465fde | |
| parent | 2164927f7e934c736e5c91b4216f97375e2ad131 (diff) | |
| download | gitlab-ce-winh-allow-picking-codestyle-changes-docs.tar.gz | |
Replace "code style changes" with "code formatting changes"winh-allow-picking-codestyle-changes-docs
| -rw-r--r-- | PROCESS.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/PROCESS.md b/PROCESS.md index f41f063323c..db788927b23 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -209,7 +209,7 @@ 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. +* Merge request that reduce the effort for picking regression fixes (such as code formatting 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 |