Skip to content

Commit 12a40c5

Browse files
authored
Merge pull request #44830 from github/repo-sync
Repo sync
2 parents 0aa6981 + 5ebeeae commit 12a40c5

10 files changed

Lines changed: 26 additions & 12 deletions

File tree

content/actions/reference/security/securely-using-pull_request_target.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ If you have confirmed you need `pull_request_target`, apply these controls to li
7171

7272
* **Ensure the underlying compute is isolated and ephemeral.** If self-hosted runners are used, you must confirm that the runner environment is properly restricted from internal resources and is not reused across {% data variables.product.prodname_actions %} runs. For more information, see [AUTOTITLE](/actions/reference/security/secure-use#hardening-for-self-hosted-runners).
7373

74-
* **Gate runs behind approval.** `pull_request_target` workflows can be gated behind a required `label` that only users with write access can add. This is detailed in the {% data variables.product.prodname_security %} [guidance on preventing pwn requests](https://securitylab.github.com/resources/github-actions-preventing-pwn-requests/#preventing-pwn-requests).
75-
7674
* **Enforce {% data variables.product.prodname_actions %} security best practices.** In addition to the specific risks of pwn requests, other common vulnerabilities, such as command injection, can exist and impact the code executed in this privileged event. For more information, see [Keeping your GitHub Actions and workflows secure: Untrusted input](https://securitylab.github.com/resources/github-actions-untrusted-input/) from the {% data variables.product.prodname_security %}. To identify and proactively protect against common {% data variables.product.prodname_actions %} vulnerabilities, enable {% data variables.product.prodname_codeql %} for {% data variables.product.prodname_actions %}. For more information, see [AUTOTITLE](/code-security/how-tos/find-and-fix-code-vulnerabilities/configure-code-scanning/configure-code-scanning).
7775

7876
## Opting out of built-in protections
@@ -81,6 +79,10 @@ If you have worked through the questions above and confirmed your workflow requi
8179

8280
This protection only covers fork pull request refs. Checking out other untrusted code, such as an unrelated third-party repository, fetching code with `git fetch` or `gh pr checkout`, or running a downloaded artifact, is not covered by the `actions/checkout` checks.
8381

82+
{% ifversion fpt or ghec %}
83+
8484
## Restricting the use of pull_request_target
8585

86-
Repository, organization, and enterprise administrators can use Workflow execution protections to control which events and actors can trigger workflows. If a repository has no legitimate use for `pull_request_target`, restricting it removes the risk regardless of how individual workflows are written.
86+
If a repository has no legitimate use for `pull_request_target`, restricting the event removes the risk regardless of how individual workflows are written. Administrators can use workflow execution protections to control which events and actors can trigger workflows. For more information, see the workflow execution protections documentation for repositories ([AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/actions-policies/workflow-execution-protections)){% ifversion ghec %}, organizations ([AUTOTITLE](/organizations/managing-organization-settings/actions-policies/workflow-execution-protections)), and across your enterprise ([AUTOTITLE](/admin/enforcing-policies/enforcing-policies-for-your-enterprise/actions-policies/workflow-execution-protections)){% else %} and organizations ([AUTOTITLE](/organizations/managing-organization-settings/actions-policies/workflow-execution-protections)){% endif %}.
87+
88+
{% endif %}

content/copilot/how-tos/administer-copilot/manage-for-enterprise/use-your-own-api-keys.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ category:
1111
- Manage Copilot for a team
1212
---
1313

14-
{% data reusables.copilot.byok-intro %} {% data reusables.copilot.byok-no-subscription-required %}
14+
{% data reusables.copilot.byok-intro %}
15+
16+
> [!NOTE]
17+
> This article covers custom models configured by enterprise owners. {% data variables.copilot.copilot_cli_short %} and {% data variables.product.prodname_vscode_shortname %} users can also use their own LLM keys locally. See [AUTOTITLE](/copilot/how-tos/copilot-cli/customize-copilot/use-byok-models) and [Add a model from a built in provider](https://code.visualstudio.com/docs/agent-customization/language-models#_add-a-model-from-a-built-in-provider) in the {% data variables.product.prodname_vscode_shortname %} documentation.
1518
1619
## Why bring your own API keys?
1720

content/copilot/how-tos/administer-copilot/manage-for-organization/use-your-own-api-keys.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ category:
1111
- Manage Copilot for a team
1212
---
1313

14-
{% data reusables.copilot.byok-intro %} {% data reusables.copilot.byok-no-subscription-required %}
14+
{% data reusables.copilot.byok-intro %}
15+
16+
> [!NOTE]
17+
> This article covers custom models configured by organization owners. {% data variables.copilot.copilot_cli_short %} and {% data variables.product.prodname_vscode_shortname %} users can also configure their own LLM provider locally, without any administrator setup. See [AUTOTITLE](/copilot/how-tos/copilot-cli/customize-copilot/use-byok-models) and [Add a model from a built in provider](https://code.visualstudio.com/docs/agent-customization/language-models#_add-a-model-from-a-built-in-provider) in the {% data variables.product.prodname_vscode_shortname %} documentation.
1518
1619
## Why bring your own API keys?
1720

content/copilot/how-tos/copilot-cli/administer-copilot-cli-for-your-enterprise.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ You can enable or disable {% data variables.copilot.copilot_cli_short %} at the
3737

3838
Users can only access AI models that are enabled at the enterprise level. When you enable or disable models in your enterprise settings, those changes are reflected in {% data variables.copilot.copilot_cli_short %}. Users can view which models are available to them using the `/model` command.
3939

40+
Enterprise and organization owners can provide keys for custom models. Users can select these like any other model: with the {% data variables.copilot.copilot_cli_short %} model selector, the `--model` flag, or environment variables. See [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/use-your-own-api-keys).
41+
42+
Separately, users can also provide their own LLM keys locally. This is not controlled by enterprise policies. See [AUTOTITLE](/copilot/how-tos/copilot-cli/customize-copilot/use-byok-models).
43+
4044
### Custom agents
4145

4246
Enterprise-configured custom agents are available to use with {% data variables.copilot.copilot_cli_short %}.
@@ -63,7 +67,6 @@ All other controls do **not** affect {% data variables.copilot.copilot_cli_short
6367

6468
* **IDE-specific policies**: Policies configured for specific IDEs or editor extensions
6569
* **Content exclusions**: File path-based content exclusions
66-
* **User-configured model providers (BYOK)**: Users can configure {% data variables.copilot.copilot_cli_short %} to use their own model providers via environment variables. This is configured at the _user level_ and cannot be controlled by enterprise policies.
6770

6871
## Why can't my developers access {% data variables.copilot.copilot_cli_short %}?
6972

content/copilot/how-tos/copilot-cli/customize-copilot/use-byok-models.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ docsTeamMetrics:
1515

1616
You can configure {% data variables.copilot.copilot_cli_short %} to use your own LLM provider, also called BYOK (Bring Your Own Key), instead of {% data variables.product.github %}-hosted models. This lets you connect to OpenAI-compatible endpoints, Azure OpenAI, or Anthropic, including locally running models such as Ollama.
1717

18+
> [!NOTE]
19+
> This article is for users who want to configure their own LLM provider API key on their local machine. To set up custom models for users in an enterprise, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/use-your-own-api-keys).
20+
1821
## Prerequisites
1922

2023
* {% data variables.copilot.copilot_cli_short %} is installed. See [AUTOTITLE](/copilot/how-tos/copilot-cli/set-up-copilot-cli/install-copilot-cli).
@@ -82,7 +85,7 @@ Use the following steps if you are connecting to OpenAI, Ollama, vLLM, Foundry L
8285
export COPILOT_PROVIDER_API_KEY=YOUR-AZURE-API-KEY
8386
export COPILOT_MODEL=YOUR-DEPLOYMENT-NAME
8487
```
85-
88+
8689
Replace the following placeholders:
8790

8891
* `YOUR-RESOURCE-NAME`: your Azure OpenAI resource name
@@ -110,7 +113,7 @@ Use the following steps if you are connecting to OpenAI, Ollama, vLLM, Foundry L
110113

111114
You can run {% data variables.copilot.copilot_cli_short %} in offline mode to prevent it from contacting {% data variables.product.github %}'s servers. This is designed for isolated environments where the CLI should communicate only with your local or on-premises model provider.
112115

113-
> [!IMPORTANT]
116+
> [!IMPORTANT]
114117
> Offline mode only guarantees full network isolation if your provider is also local or within the same isolated environment. If `COPILOT_PROVIDER_BASE_URL` points to a remote endpoint, your prompts and code context are still sent over the network to that provider.
115118
116119
1. Configure your provider environment variables as described in Configuring your provider.

content/copilot/reference/supported-surfaces-for-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ A dedicated policy exists to enable or disable each supported feature or surface
2222
| --- | --- | --- | --- | --- | --- | --- | --- |
2323
| Editor preview features | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |
2424
| {% data variables.product.prodname_copilot_short %} can search the web | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |
25-
| Enable custom models | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |
25+
| Enable custom models | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |
2626
| Suggestions matching public code | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}[^1] | {% octicon "check" aria-label="Supported" %}[^1] | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |
2727
| MCP servers in {% data variables.product.prodname_copilot_short %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
2828
| Restrict MCP access to registry servers | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |

data/reusables/copilot/byok-why.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
* **Cost management:** Align with your existing payment methods, contracts, credits, or negotiated rates, and avoid usage overages.
33
* **Visibility and control:** Manage which models your team can access, and monitor usage through your provider's existing dashboards and billing.
44
* **Flexibility:** Support custom or specialized models that your organization already uses.
5-
* **Air-gapped environments:** Use {% data variables.product.prodname_copilot_short %} in isolated networks without any dependency on {% data variables.product.github %}'s REST API in either {% data variables.product.prodname_vscode_shortname %} or {% data variables.copilot.copilot_cli_short %}.

data/reusables/enterprise-migration-tool/data-not-migrated.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* Mentions of users, teams, and organizations in pull request, issue, release, and comment bodies (the username originally mentioned is retained)
1515
* Packages in {% data variables.product.prodname_registry %}
1616
* {% data variables.product.prodname_projects_v2 %} (the new projects experience)
17+
* Reciprocal links from mentions of issues, pull requests, discussions, teams, or milestones
1718
* References between pull requests and issues in different repositories (see [AUTOTITLE](/get-started/writing-on-github/working-with-advanced-formatting/autolinked-references-and-urls))
1819
* Remediation states of {% data variables.product.prodname_secret_scanning %} results
1920
* Repositories owned by user accounts

src/audit-logs/data/version-index.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/audit-logs/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
"git": "Note: Git events have special access requirements and retention policies that differ from other audit log events. For GitHub Enterprise Cloud, access Git events via the REST API only with 7-day retention. For GitHub Enterprise Server, Git events must be enabled in audit log configuration and are not included in search results.",
1010
"sso_redirect": "Note: Automatically redirecting users to sign in is currently in beta for Enterprise Managed Users and subject to change."
1111
},
12-
"sha": "ad0dc7ebe4a70afe77bb03487060481fe7a9f13a"
12+
"sha": "3ed92647ffda0d571b4be3620e9f39d9da7086b3"
1313
}

0 commit comments

Comments
 (0)