summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-04-07 22:45:21 +0000
committerStan Hu <stanhu@gmail.com>2017-04-07 22:45:21 +0000
commita4eeb96d31dda05fc26b5b5532d78223f1430fa5 (patch)
treeedac673fbdec0a95c522dbf56f5a8e7b25739314
parente5a116873ee95343fa19beb6e3b6cbb1471e8711 (diff)
parent043a0ec0c79480ad1b110028d6f71be68859ccd2 (diff)
downloadgitlab-ce-a4eeb96d31dda05fc26b5b5532d78223f1430fa5.tar.gz
Merge branch 'clarify-mr-with-someone' into 'master'
Clarify what an MR needs to be 'with' a maintainer See merge request !10544
-rw-r--r--PROCESS.md19
1 files changed, 14 insertions, 5 deletions
diff --git a/PROCESS.md b/PROCESS.md
index 2f331ee9169..cfa841dc13d 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -73,11 +73,20 @@ These types of merge requests need special consideration:
and a dedicated team with front-end, back-end, and UX.
* **Small features**: any other feature request.
-**Large features** must be with a maintainer **by the 1st**. It's OK if they
-aren't completely done, but this allows the maintainer enough time to make the
-decision about whether this can make it in before the freeze. If the maintainer
-doesn't think it will make it, they should inform the developers working on it
-and the Product Manager responsible for the feature.
+**Large features** must be with a maintainer **by the 1st**. This means that:
+
+* There is a merge request (even if it's WIP).
+* The person (or people, if it needs a frontend and backend maintainer) who will
+ ultimately be responsible for merging this have been pinged on the MR.
+
+It's OK if merge request isn't completely done, but this allows the maintainer
+enough time to make the decision about whether this can make it in before the
+freeze. If the maintainer doesn't think it will make it, they should inform the
+developers working on it and the Product Manager responsible for the feature.
+
+The maintainer can also choose to assign a reviewer to perform an initial
+review, but this way the maintainer is unlikely to be surprised by receiving an
+MR later in the cycle.
**Small features** must be with a reviewer (not necessarily maintainer) **by the
3rd**.