diff options
Diffstat (limited to 'doc/development/code_review.md')
| -rw-r--r-- | doc/development/code_review.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 6aedb18c15d..a8c527ad30e 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -201,7 +201,8 @@ by a reviewer before passing it to a maintainer as described in the on the line of code in question with the SQL queries so they can give their advice. 1. User-facing changes include both visual changes (regardless of how minor), and changes to the rendered DOM which impact how a screen reader may announce - the content. + the content. Groups that do not have dedicated Product + Designers do not require a Product Designer to approve feature changes, unless the changes are community contributions. 1. End-to-end changes include all files in the `qa` directory. #### Acceptance checklist @@ -605,7 +606,7 @@ When ready to merge: WARNING: **If the merge request is from a fork, also check the [additional guidelines for community contributions](#community-contributions).** -- Consider using the [Squash and merge](../user/project/merge_requests/squash_and_merge.md#squash-and-merge) +- Consider using the [Squash and merge](../user/project/merge_requests/squash_and_merge.md) feature when the merge request has a lot of commits. When merging code, a maintainer should only use the squash feature if the author has already set this option, or if the merge request clearly contains a @@ -624,7 +625,7 @@ WARNING: enough to `main`. - When you set the MR to auto-merge, you should take over subsequent revisions for anything that would be spotted after that. -- For merge requests that have had [Squash and merge](../user/project/merge_requests/squash_and_merge.md#squash-and-merge) set, +- For merge requests that have had [Squash and merge](../user/project/merge_requests/squash_and_merge.md) set, the squashed commit's default commit message is taken from the merge request title. You're encouraged to [select a commit with a more informative commit message](../user/project/merge_requests/squash_and_merge.md) before merging. |