diff options
Diffstat (limited to '.gitlab/merge_request_templates')
4 files changed, 33 insertions, 15 deletions
diff --git a/.gitlab/merge_request_templates/Deprecations.md b/.gitlab/merge_request_templates/Deprecations.md index 9b84dde72df..841ef70d92a 100644 --- a/.gitlab/merge_request_templates/Deprecations.md +++ b/.gitlab/merge_request_templates/Deprecations.md @@ -1,10 +1,5 @@ <!-- Set the correct label and milestone using autocomplete for guidance. Please @mention only the DRI(s) for each stage or group rather than an entire department. --> -/label ~"release post" ~"release post item" ~"Technical Writing" ~devops:: ~group:: ~"release post item::deprecation" -/label ~"type::maintenance" -/milestone % -/assign `@EM/PM` (choose the DRI; remove backticks here, and below) - **Be sure to link this MR to the relevant deprecation issue(s).** - Deprecation Issue: @@ -42,16 +37,18 @@ They are frequently updated, and everyone should make sure they are aware of the - [ ] Set yourself as the Assignee, meaning you are the DRI. - [ ] If the deprecation is a [breaking change](https://about.gitlab.com/handbook/product/gitlab-the-product/#breaking-change), add label `breaking change`. +- [ ] Confirm this MR is labeled ~"release post item::deprecation" - [ ] Follow the process to [create a deprecation YAML file](https://about.gitlab.com/handbook/marketing/blog/release-posts/#creating-a-deprecation-entry). -- [ ] Make sure that the milestone dates are based on the dates in [Product milestone creation](https://about.gitlab.com/handbook/product/milestones/#product-milestone-creation). - [ ] Add reviewers by the 10th. -- [ ] When ready to be merged and not later than the 15th, add the `~ready` label and @ message the TW for final review and merge. +- [ ] Add scoped `devops::` and `group::` labels as necessary. +- [ ] Add the appropriate milestone to this MR. +- [ ] When ready to be merged (and no later than the 15th) `@mention` the TW for final review and merge. ## Reviewers When the content is ready for review, it must be reviewed by a Technical Writer and Engineering Manager, but can also be reviewed by Product Marketing, Product Design, and the Product Leaders for this area. Please use the -[Reviewers for Merge Requests](https://docs.gitlab.com/ee/user/project/merge_requests/getting_started#reviewer) +[reviewers](https://docs.gitlab.com/ee/user/project/merge_requests/reviews/) feature for all reviews. Reviewers will then `approve` the MR and remove themselves from Reviewers when their review is complete. - [ ] (Recommended) PMM @@ -106,3 +103,7 @@ must be updated before this MR is merged: 1. Set the MR to merge when the pipeline succeeds (or merge if the pipeline is already complete). If you have trouble running the Rake task, check the [troubleshooting steps](https://about.gitlab.com/handbook/marketing/blog/release-posts/#deprecation-rake-task-troubleshooting). + +/label ~"release post" ~"release post item" ~"Technical Writing" ~"release post item::deprecation" +/label ~"type::maintenance" +/label ~"maintenance::refactor" diff --git a/.gitlab/merge_request_templates/Quarantine End to End Test.md b/.gitlab/merge_request_templates/Quarantine End to End Test.md index 5f26f3ac74d..731b51b169b 100644 --- a/.gitlab/merge_request_templates/Quarantine End to End Test.md +++ b/.gitlab/merge_request_templates/Quarantine End to End Test.md @@ -29,7 +29,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new - [ ] To ensure a faster turnaround, ask in the `#quality_maintainers` Slack channel for someone to review and merge the merge request, rather than assigning it directly. <!-- Base labels. --> -/label ~"Quality" ~"QA" ~"type::maintenance" +/label ~"Quality" ~"QA" ~"type::maintenance" ~"maintenance::pipelines" <!-- Choose the stage that appears in the test path, e.g. ~"devops::create" for diff --git a/.gitlab/merge_request_templates/Removals.md b/.gitlab/merge_request_templates/Removals.md index f616df56480..e212893d10d 100644 --- a/.gitlab/merge_request_templates/Removals.md +++ b/.gitlab/merge_request_templates/Removals.md @@ -56,7 +56,7 @@ Please review: When the content is ready for review, the Technical Writer and Engineering Manager _must_ review it. Optional reviewers can include Product Marketing, Product Design, and the Product Leaders for this area. Use the -[Reviewers for Merge Requests](https://docs.gitlab.com/ee/user/project/merge_requests/getting_started#reviewer) +[reviewers](https://docs.gitlab.com/ee/user/project/merge_requests/reviews/) feature for all reviews. Reviewers will `approve` the MR and remove themselves from the reviewers list when their review is complete. - [ ] (Recommended) PMM diff --git a/.gitlab/merge_request_templates/Revert To Resolve Incident.md b/.gitlab/merge_request_templates/Revert To Resolve Incident.md index 17ff239bbd4..4e77846575a 100644 --- a/.gitlab/merge_request_templates/Revert To Resolve Incident.md +++ b/.gitlab/merge_request_templates/Revert To Resolve Incident.md @@ -1,14 +1,31 @@ -## Purpose of Revert +<!-- + IMPORTANT: Add appropriate labels BEFORE you save the merge request. CI/CD jobs + can be skipped only if the labels are applied BEFORE the CI/CD pipeline is created. + See https://docs.gitlab.com/ee/development/pipelines#revert-mrs for more info. +--> + +## Purpose of revert <!-- Please link to the relevant incident --> -### Check-list +### Checklist - [ ] Create an issue to reinstate the merge request and assign it to the author of the reverted merge request. -- [ ] If the revert is to resolve a ['broken master' incident](https://about.gitlab.com/handbook/engineering/workflow/#broken-master), please read through the [Responsibilities of the Broken 'Master' resolution DRI](https://about.gitlab.com/handbook/engineering/workflow/#responsibilities-of-the-resolution-dri) -- [ ] Add the appropriate labels **before** the MR is created (we can only skip CI/CD jobs if the labels are added **before** the CI/CD pipeline gets created) +- [ ] If the revert is to resolve a [broken 'master' incident](https://about.gitlab.com/handbook/engineering/workflow/#broken-master), please read through the [Responsibilities of the Broken `master` resolution DRI](https://about.gitlab.com/handbook/engineering/workflow/#responsibilities-of-the-resolution-dri). +- [ ] Add the appropriate labels **before** the MR is created. We can skip CI/CD jobs only if the labels are added **before** the CI/CD pipeline is created. + +### Milestone info + +- [ ] I am reverting something in the **current** milestone. No changelog is needed, and I've added a `~"regression:*"` label. +- [ ] I am reverting something in a **different** milestone. A changelog is needed, and I've removed the `~"regression:*"` label. + +### Related issues and merge requests + /label ~"pipeline:expedite" ~"master:broken" -<!-- If applicable, specifying the regression label in the current milestone will skip additional CI/CD jobs (e.g. Danger changelog checks) --> +<!-- + Regression label: if applicable, specify the milestone-specific regression label + (such as ~regression:15.8) to skip additional CI/CD jobs, like Danger changelog checks. --> + <!-- /label ~regression: --> |