summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-09-10 09:26:55 +0000
committerEvan Read <eread@gitlab.com>2019-09-10 09:26:55 +0000
commit1a9cc19ac32eb44adfab65a16f270e9583cf8f08 (patch)
tree50e9a4b48ad1c84f5724395a0add4aaa4446506d /doc
parenta66c7c2e3b95a4ef2aa1e33e63e1bbbf03954f07 (diff)
parenta706f110a40bf67a2bb4793cbe603f8f9a0404c6 (diff)
downloadgitlab-ce-1a9cc19ac32eb44adfab65a16f270e9583cf8f08.tar.gz
Merge branch 'docs-dblessing-codeowners-approvals' into 'master'
Only CODEOWNERS on default branch affect MR approvals See merge request gitlab-org/gitlab-ce!32841
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/merge_requests/merge_request_approvals.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/merge_request_approvals.md b/doc/user/project/merge_requests/merge_request_approvals.md
index e9869e39b79..a18c2d3a21f 100644
--- a/doc/user/project/merge_requests/merge_request_approvals.md
+++ b/doc/user/project/merge_requests/merge_request_approvals.md
@@ -184,6 +184,10 @@ the merge request. To enable this feature:
When this feature is enabled, all merge requests will need approval
from one code owner per matched rule before it can be merged.
+NOTE: **Note:** Only the `CODEOWNERS` file on the default branch is evaluated for
+Merge Request approvals. If `CODEOWNERS` is changed on a non-default branch, those
+changes will not affect approvals until merged to the default branch.
+
## Overriding the merge request approvals default settings
> Introduced in GitLab Enterprise Edition 9.4.