@@ -96,11 +96,16 @@ with [domain expertise](#domain-experts).
...
@@ -96,11 +96,16 @@ with [domain expertise](#domain-experts).
1. If your merge request includes documentation changes, it must be **approved
1. If your merge request includes documentation changes, it must be **approved
by a [Technical writer](https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers)**, based on
by a [Technical writer](https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers)**, based on
the appropriate [product category](https://about.gitlab.com/handbook/product/categories/).
the appropriate [product category](https://about.gitlab.com/handbook/product/categories/).
1. If your merge request includes Quality and non-Quality-related changes (*3*), it must be **approved
by a [Software Engineer in Test](https://about.gitlab.com/handbook/engineering/quality/#individual-contributors)**.
1. If your merge request includes _only_ Quality-related changes (*3*), it must be **approved
by a [Quality maintainer](https://about.gitlab.com/handbook/engineering/projects/#gitlab_maintainers_qa)**.
- (*1*): Please note that specs other than JavaScript specs are considered backend code.
- (*1*): Please note that specs other than JavaScript specs are considered backend code.
- (*2*): We encourage you to seek guidance from a database maintainer if your merge
- (*2*): We encourage you to seek guidance from a database maintainer if your merge
request is potentially introducing expensive queries. It is most efficient to comment
request is potentially introducing expensive queries. It is most efficient to comment
on the line of code in question with the SQL queries so they can give their advice.
on the line of code in question with the SQL queries so they can give their advice.
- (*3*): Quality-related changes include all files within the `qa` directory.
#### Security requirements
#### Security requirements
...
@@ -320,6 +325,7 @@ Before taking the decision to merge:
...
@@ -320,6 +325,7 @@ Before taking the decision to merge:
- Consider warnings and errors from danger bot, code quality, and other reports.
- Consider warnings and errors from danger bot, code quality, and other reports.
Unless a strong case can be made for the violation, these should be resolved
Unless a strong case can be made for the violation, these should be resolved
before merging. A comment must to be posted if the MR is merged with any failed job.
before merging. A comment must to be posted if the MR is merged with any failed job.
- If the MR contains both Quality and non-Quality-related changes, the MR should be merged by the relevant maintainer for user-facing changes (backend, frontend, or database) after the Quality related changes are approved by a Software Engineer in Test.
