Automatic merge of gitlab-org/gitlab-ce master

doc/development/code_review.md

@@ -72,7 +72,7 @@ from teams other than your own.
 1. If your merge request includes adding a new UI/UX paradigm [^1], it must be
    **approved by a [UX lead][team]**.
 1. If your merge request includes a new dependency or a filesystem change, it must be
-   **approved by a [Distribution team member][team]**. See how to work with the [Distribution team](https://about.gitlab.com/handbook/engineering/dev-backend/distribution/) for more details.
+   **approved by a [Distribution team member][team]**. See how to work with the [Distribution team](https://about.gitlab.com/handbook/engineering/development/enablement/distribution/#how-to-work-with-distribution) for more details.
 
 #### Security requirements
 

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.