From 136d4ccb904c426099acaaa91741b9e6f5f1cec9 Mon Sep 17 00:00:00 2001 From: Imre Farkas Date: Fri, 20 Mar 2020 17:23:36 +0100 Subject: [PATCH] Clarify milestone for security MRs targeting master --- general/security/developer.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/general/security/developer.md b/general/security/developer.md index 3d28dc02..8d45b202 100644 --- a/general/security/developer.md +++ b/general/security/developer.md @@ -104,7 +104,9 @@ For every merge request created, make sure: They are normally created around the 18th. In the meantime, you can set the MR to target `master` instead, and change it later once the stable branch has been created. * Has a milestone assigned, e.g. a `11-10-stable-` backport MR would have `11.10` set as its milestone. - * The MR targeting `master` has the next upcoming milestone assigned. + * The MR targeting `master` has the milestone for the release following the current + one. If e.g. the current release is `11.10` (which is about to be released on + the 22nd), the MR targeting `master` should have `11.11`. * Milestones that have already been closed are not displayed in the UI, but can still be set using the quick action command `/milestone %X.Y`. * Has correct labels (normally ~security is enough). * Has green pipelines. -- GitLab