Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-07 00:07:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-07 00:07:59 +0300
commit1c25ac983cd1e4335faa1ec4922c314d6321e224 (patch)
tree68d88ab5d9ed5c3397e52fe85fc38ab237335a91 /doc/user/project/code_owners.md
parent83731155d997ae24c7e0cd5ffa6f0dba41bec6dc (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/code_owners.md')
-rw-r--r--doc/user/project/code_owners.md14
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/user/project/code_owners.md b/doc/user/project/code_owners.md
index a81c0beb6d0..4ab615a1008 100644
--- a/doc/user/project/code_owners.md
+++ b/doc/user/project/code_owners.md
@@ -25,8 +25,18 @@ specify themselves as a code owner, all before the new changes
get merged to the default branch.
When a file matches multiple entries in the `CODEOWNERS` file,
-the users from all entries are displayed on the blob page of
-the given file.
+the users from last pattern matching the file are displayed on the
+blob page of the given file. For example, you have the following
+`CODEOWNERS` file:
+
+```
+README.md @user1
+
+# This line would also match the file README.md
+*.md @user2
+```
+
+The user that would show for `README.md` would be `@user2`.
## Approvals by Code Owners