Merge pull request github#11902 from github/repo-sync

repo sync
johnperez416 · Nov 12, 2021 · 54643f9 · 54643f9
2 parents 692c20b + 4dddeef
commit 54643f9
Show file tree

Hide file tree

Showing 14 changed files with 270 additions and 541 deletions.
diff --git a/...ns/organizing-members-into-teams/managing-code-review-settings-for-your-team.md b/...ns/organizing-members-into-teams/managing-code-review-settings-for-your-team.md
@@ -34,7 +34,7 @@ When you choose to only notify requested team members, you disable sending notif
 
 When you enable auto assignment, any time your team has been requested to review a pull request, the team is removed as a reviewer and a specified subset of team members are assigned in the team's place. Code review assignments allow you to decide whether the whole team or just a subset of team members are notified when a team is requested for review.
 
-When code owners are automatically requested for review, the team is still removed and replaced with individuals. The individual approvals don't satisfy the requirement for code owner approval in a protected branch. For more information, see "[About code owners](/github/creating-cloning-and-archiving-repositories/about-code-owners)."
+When code owners are automatically requested for review, the team is still removed and replaced with individuals unless a branch protection rule is configured to require review from code owners. If such a branch protection rule is in place, the team request cannot be removed and so the individual request will appear in addition.
 
 {% ifversion fpt %}
 To further enhance your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like protected branches and code owners on private repositories. {% data reusables.enterprise.link-to-ghec-trial %}

diff --git a/...ositorys-settings-and-features/customizing-your-repository/about-code-owners.md b/...ositorys-settings-and-features/customizing-your-repository/about-code-owners.md
@@ -25,8 +25,6 @@ Code owners are automatically requested for review when someone opens a pull req
 
 When someone with admin or owner permissions has enabled required reviews, they also can optionally require approval from a code owner before the author can merge a pull request in the repository. For more information, see "[About protected branches](/github/administering-a-repository/about-protected-branches#require-pull-request-reviews-before-merging)."
 
-{% ifversion fpt or ghae or ghes or ghec %}If a team has enabled code review assignments, the individual approvals won't satisfy the requirement for code owner approval in a protected branch. For more information, see "[Managing code review settings for your team](/organizations/organizing-members-into-teams/managing-code-review-settings-for-your-team)."{% endif %}
-
 If a file has a code owner, you can see who the code owner is before you open a pull request. In the repository, you can browse to the file and hover over {% octicon "shield-lock" aria-label="The edit icon" %}.
 
 ![Code owner for a file in a repository](/assets/images/help/repository/code-owner-for-a-file.png)

diff --git a/lib/rest/static/decorated/api.github.com.json b/lib/rest/static/decorated/api.github.com.json
@@ -48169,8 +48169,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -48264,8 +48263,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -48437,8 +48435,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       },
@@ -48617,8 +48614,7 @@
         "schema": {
           "type": "string",
           "description": "An identifier for the upload.",
-          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53",
-          "nullable": false
+          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53"
         },
         "descriptionHTML": "<p>Filter analyses belonging to the same SARIF upload.</p>"
       }
@@ -76111,8 +76107,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -76206,8 +76201,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }

diff --git a/lib/rest/static/decorated/ghes-3.0.json b/lib/rest/static/decorated/ghes-3.0.json
@@ -45889,8 +45889,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -45984,8 +45983,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -46211,8 +46209,7 @@
         "schema": {
           "type": "string",
           "description": "An identifier for the upload.",
-          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53",
-          "nullable": false
+          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53"
         },
         "descriptionHTML": "<p>Filter analyses belonging to the same SARIF upload.</p>"
       }

diff --git a/lib/rest/static/decorated/ghes-3.1.json b/lib/rest/static/decorated/ghes-3.1.json
@@ -46144,8 +46144,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -46239,8 +46238,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -46412,8 +46410,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       },
@@ -46592,8 +46589,7 @@
         "schema": {
           "type": "string",
           "description": "An identifier for the upload.",
-          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53",
-          "nullable": false
+          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53"
         },
         "descriptionHTML": "<p>Filter analyses belonging to the same SARIF upload.</p>"
       }
@@ -71371,8 +71367,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -71466,8 +71461,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }

diff --git a/lib/rest/static/decorated/ghes-3.2.json b/lib/rest/static/decorated/ghes-3.2.json
@@ -47390,8 +47390,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -47485,8 +47484,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -47658,8 +47656,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       },
@@ -47838,8 +47835,7 @@
         "schema": {
           "type": "string",
           "description": "An identifier for the upload.",
-          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53",
-          "nullable": false
+          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53"
         },
         "descriptionHTML": "<p>Filter analyses belonging to the same SARIF upload.</p>"
       }
@@ -73695,8 +73691,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -73790,8 +73785,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }

diff --git a/lib/rest/static/decorated/ghes-3.3.json b/lib/rest/static/decorated/ghes-3.3.json
@@ -47679,8 +47679,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -47774,8 +47773,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -47947,8 +47945,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       },
@@ -48127,8 +48124,7 @@
         "schema": {
           "type": "string",
           "description": "An identifier for the upload.",
-          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53",
-          "nullable": false
+          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53"
         },
         "descriptionHTML": "<p>Filter analyses belonging to the same SARIF upload.</p>"
       }
@@ -74014,8 +74010,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -74109,8 +74104,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }

diff --git a/lib/rest/static/decorated/github.ae.json b/lib/rest/static/decorated/github.ae.json
@@ -39306,8 +39306,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -39401,8 +39400,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -39574,8 +39572,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       },
@@ -39754,8 +39751,7 @@
         "schema": {
           "type": "string",
           "description": "An identifier for the upload.",
-          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53",
-          "nullable": false
+          "example": "6c81cd8e-b078-4ac3-a3be-1dad7dbd0b53"
         },
         "descriptionHTML": "<p>Filter analyses belonging to the same SARIF upload.</p>"
       }
@@ -64213,8 +64209,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }
@@ -64308,8 +64303,7 @@
         "schema": {
           "type": "integer",
           "description": "The security alert number.",
-          "readOnly": true,
-          "nullable": false
+          "readOnly": true
         },
         "descriptionHTML": "<p>The number that identifies an alert. You can find this at the end of the URL for a code scanning alert within GitHub, and in the <code>number</code> field in the response from the <code>GET /repos/{owner}/{repo}/code-scanning/alerts</code> operation.</p>"
       }