Merge changes I1f101173,I32b0d8b9,Ic191c620 * changes: Fix a heading in the validation documentation Validation: Do not reject imports that are added in the same commit Add config option to disable validation of code owner configs on submit
diff --git a/resources/Documentation/user-guide.md b/resources/Documentation/user-guide.md index 340d3a5..70dfaeb 100644 --- a/resources/Documentation/user-guide.md +++ b/resources/Documentation/user-guide.md
@@ -97,6 +97,11 @@ that votes are sticky across patch sets, then also the code owner approvals which are based on these votes will be sticky. +**NOTE:** Whether code owners can approve their own changes depends of the +definition of the required label. If the label definition has +[ignoreSelfApproval](../../../Documentation/config-labels.html#label_ignoreSelfApproval) +enabled, code owner approvals of the patch set uploader are ignored. + ## <a id="codeOwnerOverride">Code owner override Usually some privileged users, such as sheriffs, are allowed to override the @@ -168,6 +173,11 @@ ## <a id="renames">Renames +A rename is treated as a deletion at the old path and a creation at the new +path. This is why for files that are renamed, Gerrit requires a code owner +approval for the old and the new path of the files (also see [code owner +approval](#codeOwnerApproval) section). + When files/folders get renamed, their code owner configuration should stay intact. Renaming a file/folder should normally not result in a situation where the code owner configuration for this file/folder no longer applies, because it @@ -186,10 +196,8 @@ is owned by user A, '*.txt' is owned by user B and 'config.md' is renamed to 'config.txt'. In this case it is the responsibility of the author doing the rename and the current code owners to ensure that the file/folder has the proper -code owners at the new path. This is why for files that are renamed Gerrit -requires a code owner approval for the old and the new path of the files (also -see [code owner approval](#codeOwnerApproval) section). Also this is the reason -why [matching subfolders via path expressions is +code owners at the new path. This is also the reason why [matching subfolders +via path expressions is discouraged](backend-find-owners.html#doNotUsePathExpressionsForSubdirectories). ## <a id="mergeCommits">Merge commits