diff options
| author | Evan Read <eread@gitlab.com> | 2019-06-06 01:39:54 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-06-06 01:39:54 +0000 |
| commit | 58328ca9dc7828cbbf4b36a4f782f1b8dc3e8fb8 (patch) | |
| tree | 9c416a3bb1e885b72d7042d04d32e8f03fce38bb | |
| parent | 262a1ca14f1494c1ff2f7aab0d1c7e22b4044eb2 (diff) | |
| parent | 35ff10f7d39a5fc60ebe5589693ebadda77f3913 (diff) | |
| download | gitlab-ce-58328ca9dc7828cbbf4b36a4f782f1b8dc3e8fb8.tar.gz | |
Merge branch 'docs/patch-67' into 'master'
Update PROCESS.md - fix grammar
See merge request gitlab-org/gitlab-ce!29210
| -rw-r--r-- | PROCESS.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PROCESS.md b/PROCESS.md index 1f99cebe081..3c40f658070 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -113,7 +113,7 @@ corresponding exception request to be created. A level of common sense should be applied when deciding whether to have a feature behind a feature flag off or on by default. -The following guideliness can be applied to help make this decision: +The following guidelines can be applied to help make this decision: * If the feature is not fully ready or functioning, the feature flag should be disabled by default. * If the feature is ready but there are concerns about performance or impact, the feature flag should be enabled by default, but @@ -125,7 +125,7 @@ For more information on rolling out changes using feature flags, read [through t In order to build the final package and present the feature for self-hosted customers, the feature flag should be removed. This should happen before the 22nd, ideally _at least_ 2 days before. That means MRs with feature -flags being picked at the 19th would have a quite tight schedule, so picking +flags being picked at the 19th would have quite a tight schedule, so picking these _earlier_ is preferable. While rare, release managers may decide to reject picking a change into a stable |