summaryrefslogtreecommitdiff
path: root/PROCESS.md
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-08 15:31:36 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-08 16:47:27 -0600
commit7fd0934f5aa4badad30e6ce696ac3893987cda2d (patch)
tree8b7b95f5e4d3933543828d4ef9205c2acbb06708 /PROCESS.md
parent2d8eb2dc6a10a48645253b0b3ead6b61dd9c4634 (diff)
downloadgitlab-ce-7fd0934f5aa4badad30e6ce696ac3893987cda2d.tar.gz
Small rephrase
Diffstat (limited to 'PROCESS.md')
-rw-r--r--PROCESS.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/PROCESS.md b/PROCESS.md
index c61293f424f..53a6dc4fad9 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -76,7 +76,7 @@ You and they should weigh the benefit and urgency of the change (how important i
against the potential negative impact (things breaking without enough time to comfortably find them and fix them before the release on the 22nd).
When in doubt, we err on the side of _not_ cherry-picking.
-For example, an exception may be made for a trivial 1-5 line performance improvement
+For example, it is likely that an exception will be made for a trivial 1-5 line performance improvement
(e.g. adding an index or adding `includes` to a query), but not for a new feature, no matter how relatively small or thoroughly tested.
During the feature freeze all merge requests that are meant to go into the upcoming