Skip to content

Commit abffac0

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main-enterprise' into main-enterprise
2 parents ca31ca1 + 3d61f1f commit abffac0

29 files changed

Lines changed: 8885 additions & 188 deletions

app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ default_permissions:
115115
organization_administration: write
116116

117117
# Manage Actions variables.
118-
# https://docs.github.com/en/rest/actions/variables?apiVersion=2022-11-28
118+
# https://docs.github.com/en/rest/actions/variables?apiVersion=2026-03-10
119119
actions_variables: write
120120

121121

docs/github-settings/1. repository-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ repository:
5050
5151
>[!TIP]
5252
>GitHub's API documentation defines these inputs and types:
53-
>1. [Update an environment](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#update-a-repository)
54-
>2. [Replace all repository topics](https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#replace-all-repository-topics)
53+
>1. [Update an environment](https://docs.github.com/en/rest/repos/repos?apiVersion=2026-03-10#update-a-repository)
54+
>2. [Replace all repository topics](https://docs.github.com/en/rest/repos/repos?apiVersion=2026-03-10#replace-all-repository-topics)
5555
5656
<table>
5757
<tr><td>

docs/github-settings/2. repository-variables.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variables:
1818
1919
>[!TIP]
2020
>GitHub's API documentation defines these inputs and types:
21-
>1. [Update a repository variable](https://docs.github.com/en/rest/actions/variables?apiVersion=2022-11-28#update-a-repository-variable)
21+
>1. [Update a repository variable](https://docs.github.com/en/rest/actions/variables?apiVersion=2026-03-10#update-a-repository-variable)
2222
2323
<table>
2424
<tr><td>

docs/github-settings/3. collaborators.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ collaborators:
2020
2121
>[!TIP]
2222
>GitHub's API documentation defines these inputs and types:
23-
>1. [Add a repository collaborator](https://docs.github.com/en/rest/collaborators/collaborators?apiVersion=2022-11-28#add-a-repository-collaborator)
24-
>2. [Remove a repository collaborator](https://docs.github.com/en/rest/collaborators/collaborators?apiVersion=2022-11-28#remove-a-repository-collaborator)
23+
>1. [Add a repository collaborator](https://docs.github.com/en/rest/collaborators/collaborators?apiVersion=2026-03-10#add-a-repository-collaborator)
24+
>2. [Remove a repository collaborator](https://docs.github.com/en/rest/collaborators/collaborators?apiVersion=2026-03-10#remove-a-repository-collaborator)
2525
2626
<table>
2727
<tr><td>

docs/github-settings/4. teams.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ teams:
2020
2121
>[!TIP]
2222
>GitHub's API documentation defines these inputs and types:
23-
>1. [Add or update team repository permissions](https://docs.github.com/en/rest/teams/teams?apiVersion=2022-11-28#add-or-update-team-repository-permissions)
23+
>1. [Add or update team repository permissions](https://docs.github.com/en/rest/teams/teams?apiVersion=2026-03-10#add-or-update-team-repository-permissions)
2424
2525
<table>
2626
<tr><td>

docs/github-settings/5. branch-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ branches:
5555
5656
>[!TIP]
5757
>GitHub's API documentation defines these inputs and types:
58-
>1. [Update a repository variable](https://docs.github.com/en/rest/actions/variables?apiVersion=2022-11-28#update-a-repository-variable)
58+
>1. [Update branch protection](https://docs.github.com/en/rest/branches/branch-protection?apiVersion=2026-03-10#update-branch-protection)
5959
6060
<table>
6161
<tr><td>

docs/github-settings/6. deployment-environments.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ environments:
4646
4747
>[!TIP]
4848
>GitHub's API documentation defines these inputs and types:
49-
>1. [Create or update an environment](https://docs.github.com/en/rest/deployments/environments?apiVersion=2022-11-28#create-or-update-an-environment)
50-
>2. [Create a deployment branch policy](https://docs.github.com/en/rest/deployments/branch-policies?apiVersion=2022-11-28#create-a-deployment-branch-policy)
51-
>3. [Create an environment variable](https://docs.github.com/en/rest/actions/variables?apiVersion=2022-11-28#create-an-environment-variable)
49+
>1. [Create or update an environment](https://docs.github.com/en/rest/deployments/environments?apiVersion=2026-03-10#create-or-update-an-environment)
50+
>2. [Create a deployment branch policy](https://docs.github.com/en/rest/deployments/branch-policies?apiVersion=2026-03-10#create-a-deployment-branch-policy)
51+
>3. [Create an environment variable](https://docs.github.com/en/rest/actions/variables?apiVersion=2026-03-10#create-an-environment-variable)
5252
5353
<table>
5454
<tr><td>

docs/github-settings/7. autolinks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ variables:
2020
2121
>[!TIP]
2222
>GitHub's API documentation defines these inputs and types:
23-
>1. [Create an autolink reference for a repository](https://docs.github.com/en/rest/repos/autolinks?apiVersion=2022-11-28#create-an-autolink-reference-for-a-repository)
23+
>1. [Create an autolink reference for a repository](https://docs.github.com/en/rest/repos/autolinks?apiVersion=2026-03-10#create-an-autolink-reference-for-a-repository)
2424
2525
<table>
2626
<tr><td>

docs/github-settings/8. labels.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ labels:
1919
2020
>[!TIP]
2121
>GitHub's API documentation defines these inputs and types:
22-
>1. [Create a label](https://docs.github.com/en/rest/issues/labels?apiVersion=2022-11-28#create-a-label)
23-
>2. [Update a label](https://docs.github.com/en/rest/issues/labels?apiVersion=2022-11-28#update-a-label)
24-
>3. [Delete a label](https://docs.github.com/en/rest/issues/labels?apiVersion=2022-11-28#delete-a-label)
22+
>1. [Create a label](https://docs.github.com/en/rest/issues/labels?apiVersion=2026-03-10#create-a-label)
23+
>2. [Update a label](https://docs.github.com/en/rest/issues/labels?apiVersion=2026-03-10#update-a-label)
24+
>3. [Delete a label](https://docs.github.com/en/rest/issues/labels?apiVersion=2026-03-10#delete-a-label)
2525
2626
<table>
2727
<tr><td>

docs/sample-settings/sample-deployment-settings.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ overridevalidators:
2727
error: |
2828
`Branch protection required_approving_review_count cannot be overidden to a lower value`
2929
script: |
30-
console.log(`baseConfig ${JSON.stringify(baseconfig)}`)
31-
console.log(`overrideConfig ${JSON.stringify(overrideconfig)}`)
32-
if (baseconfig.protection.required_pull_request_reviews.required_approving_review_count && overrideconfig.protection.required_pull_request_reviews.required_approving_review_count ) {
33-
return overrideconfig.protection.required_pull_request_reviews.required_approving_review_count >= baseconfig.protection.required_pull_request_reviews.required_approving_review_count
30+
const baseCount = baseconfig?.protection?.required_pull_request_reviews?.required_approving_review_count
31+
const overrideCount = overrideconfig?.protection?.required_pull_request_reviews?.required_approving_review_count
32+
if (baseCount && overrideCount) {
33+
return overrideCount >= baseCount
3434
}
3535
return true
3636
- plugin: labels

0 commit comments

Comments
 (0)