Skip to content

Commit bb9d440

Browse files
authored
Merge pull request #37466 from github/repo-sync
Repo sync
2 parents 4d25548 + 2ba14cc commit bb9d440

11 files changed

+96
-34
lines changed
Loading

content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise.md

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,22 @@ You can enforce policies to manage the use of security features within organizat
3535

3636
Additionally, you can enforce policies for the use of {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %} products{% endif %} in your enterprise's organizations and repositories.
3737

38+
## Enforcing a policy for the availablity of {% data variables.product.prodname_AS %} in your enterprise's organizations
39+
40+
{% data variables.product.github %} bills for {% data variables.product.prodname_AS %} products on a per-committer basis. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#managing-committers-and-costs).
41+
42+
You can enforce a policy that controls whether repository administrators are allowed to enable features for {% data variables.product.prodname_AS %} in an organization's repositories. You can configure a policy for all organizations owned by your enterprise account, or for individual organizations that you choose.
43+
44+
Disallowing {% data variables.product.prodname_GH_cs_or_sp %} for an organization prevents repository administrators from enabling {% data variables.product.prodname_GH_cs_or_sp %} features for additional repositories, but does not disable the features for repositories where the features are already enabled.
45+
46+
{% data reusables.enterprise.role-permission-hierarchy %}
47+
48+
{% data reusables.enterprise-accounts.access-enterprise %}
49+
{% data reusables.enterprise-accounts.policies-tab %}
50+
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
51+
{% data reusables.enterprise-accounts.advanced-security-organization-policy-drop-down %}
52+
{% data reusables.enterprise-accounts.advanced-security-individual-organization-policy-drop-down %}
53+
3854
{% ifversion ghec %}
3955

4056
## Enforcing a policy for visibility of dependency insights
@@ -46,7 +62,7 @@ Across all organizations owned by your enterprise, you can control whether organ
4662
{% data reusables.enterprise-accounts.access-enterprise %}
4763
{% data reusables.enterprise-accounts.policies-tab %}
4864
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
49-
1. Under "Dependency insights", review the information about changing the setting.
65+
1. In the "Policies" section, under "Dependency insights", review the information about changing the setting.
5066
1. {% data reusables.enterprise-accounts.view-current-policy-config-orgs %}
5167
1. Under "Dependency insights", select the dropdown menu and click a policy.
5268

@@ -63,32 +79,26 @@ Across all organizations owned by your enterprise, you can allow members with ad
6379
{% data reusables.enterprise-accounts.access-enterprise %}
6480
{% data reusables.enterprise-accounts.policies-tab %}
6581
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
66-
1. Under "Enable or disable {% data variables.product.prodname_dependabot_alerts %} by repository admins", use the dropdown menu to choose a policy.
82+
1. In the "Policies" section, under "Enable or disable {% data variables.product.prodname_dependabot_alerts %} by repository admins", use the dropdown menu to choose a policy.
6783

6884
{% endif %}
6985

70-
## Enforcing a policy for the use of {% data variables.product.prodname_GH_advanced_security %} in your enterprise's organizations
86+
## Enforcing a policy to manage the use of {% data variables.product.prodname_AS %} features in your enterprise's repositories
7187

72-
{% data reusables.advanced-security.about-ghas-organization-policy %}
73-
74-
{% data reusables.enterprise.role-permission-hierarchy %}
88+
Across all of your enterprise's organizations, you can allow or disallow people with admin access to repositories to manage the use of {% data variables.product.prodname_AS %} features in the repositories.
7589

7690
{% data reusables.enterprise-accounts.access-enterprise %}
7791
{% data reusables.enterprise-accounts.policies-tab %}
7892
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
79-
1. In the "{% data variables.product.prodname_GH_advanced_security %} policies" section, under "{% data variables.product.prodname_GH_advanced_security %} availability", select the dropdown menu and click a policy for the organizations owned by your enterprise.
80-
81-
{% data reusables.enterprise-accounts.advanced-security-organization-policy-drop-down %}
82-
{% data reusables.enterprise-accounts.advanced-security-individual-organization-policy-drop-down %}
83-
84-
## Enforcing a policy to manage the use of {% data variables.product.prodname_GH_advanced_security %} features in your enterprise's repositories
85-
86-
Across all of your enterprise's organizations, you can allow or disallow people with admin access to repositories to manage the use of {% data variables.product.prodname_GH_advanced_security %} features in the repositories. {% data reusables.advanced-security.ghas-must-be-enabled %}
93+
{% ifversion ghas-products %}
94+
1. In the "Policies" section, under "Repository administrators can enable or disable `PRODUCT`", use the dropdown menu to define whether repository administrators can change the enablement of {% data variables.product.prodname_cs_and_sp %}.
95+
{% else %}
96+
1. In the "{% data variables.product.prodname_GHAS %} policies" section, under "Enable or disable {% data variables.product.prodname_GHAS %} by repository admins", select the dropdown menu and click a policy.
97+
{% endif %}
8798

88-
{% data reusables.enterprise-accounts.access-enterprise %}
89-
{% data reusables.enterprise-accounts.policies-tab %}
90-
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
91-
1. In the "{% data variables.product.prodname_GH_advanced_security %} policies" section, under "Enable or disable {% data variables.product.prodname_GH_advanced_security %} by repository admins", select the dropdown menu and click a policy.
99+
{% ifversion ghas-products %}
100+
<!--This option is included automatically by the "Repository Admins can Enable or Disable Secret Protection" option, which is why this section is omitted for `ghas-products` versions.-->
101+
{% else %}
92102

93103
## Enforcing a policy to manage the use of {% data variables.product.prodname_secret_scanning %} in your enterprise's repositories
94104

@@ -99,18 +109,20 @@ Across all of your enterprise's organizations, you can allow or disallow people
99109
{% data reusables.enterprise-accounts.access-enterprise %}
100110
{% data reusables.enterprise-accounts.policies-tab %}
101111
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
102-
1. In the "{% data variables.product.prodname_GH_advanced_security %} policies" section, under "Enable or disable {% data variables.product.prodname_secret_scanning %} by repository admins", select the dropdown menu and click a policy.
112+
1. In the "Policies" section, under "Enable or disable {% data variables.product.prodname_secret_scanning %} by repository admins", select the dropdown menu and click a policy.
113+
114+
{% endif %}
103115

104116
{% ifversion secret-scanning-ai-generic-secret-detection %}
105117

106-
## Enforcing a policy to manage the use of {% data variables.secret-scanning.generic-secret-detection %} for {% data variables.product.prodname_secret_scanning %} in your enterprise's repositories
118+
## Enforcing a policy to manage the use of AI detection for {% data variables.product.prodname_secret_scanning %} in your enterprise's repositories
107119

108-
Across all of your enterprise's organizations, you can allow or disallow people with admin access to repositories to manage and configure AI detection in {% data variables.product.prodname_secret_scanning %} for the repositories. {% data reusables.advanced-security.ghas-must-be-enabled %}
120+
Across all of your enterprise's organizations, you can allow or disallow people with admin access to repositories to manage and configure AI detection in {% data variables.product.prodname_secret_scanning %} for the repositories. This policy only takes effect if repository administrators are also allowed to change enablement of {% data variables.product.prodname_secret_protection %} (controlled by the "Repository administrators can enable or disable Secret Protection" policy).
109121

110122
{% data reusables.enterprise-accounts.access-enterprise %}
111123
{% data reusables.enterprise-accounts.policies-tab %}
112124
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
113-
1. In the "{% data variables.product.prodname_GH_advanced_security %} policies" section, under "AI detection in {% data variables.product.prodname_secret_scanning %}", select the dropdown menu and click a policy.
125+
1. In the "Policies" section, under "AI detection in {% data variables.product.prodname_secret_scanning %}", select the dropdown menu and click a policy.
114126

115127
{% endif %}
116128

@@ -123,6 +135,6 @@ Across all of your enterprise's organizations, you can allow or disallow people
123135
{% data reusables.enterprise-accounts.access-enterprise %}
124136
{% data reusables.enterprise-accounts.policies-tab %}
125137
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
126-
1. In the "{% data variables.product.prodname_GH_advanced_security %} policies" section, under "{% data variables.product.prodname_copilot_autofix_short %}", select the dropdown menu and click a policy.
138+
1. In the "Policies" section, under "{% data variables.product.prodname_copilot_autofix_short %}", select the dropdown menu and click a policy.
127139

128140
{% endif %}

content/github-models/integrating-ai-models-into-your-development-workflow.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,47 @@ If you have a {% data variables.product.prodname_copilot_short %} subscription,
3030
* Executing prompts using a particular model. This is especially useful when you want to use a model that is not currently available in multi-model {% data variables.product.prodname_copilot_chat_short %}.
3131
* Listing models currently available through {% data variables.product.prodname_github_models %}
3232

33+
## Using AI models with {% data variables.product.prodname_actions %}
34+
35+
You can use the {% data variables.product.prodname_actions %} token (`GITHUB_TOKEN`) to call AI models directly inside your workflows.
36+
37+
### Setting permissions
38+
39+
To use AI models in your workflows, you need to ensure that the `models` permission is enabled in your workflow configuration. This permission allows workflows to access the {% data variables.product.prodname_github_models %} inference API. You can either set this permission itself or use the general `read-all` or `write-all` permissions. See [AUTOTITLE](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-actions).
40+
41+
### Writing your workflow file
42+
43+
You can call the inference API directly from your workflow. For instance:
44+
45+
```yaml
46+
name: Use GitHub Models
47+
48+
on:
49+
workflow_dispatch:
50+
51+
permissions:
52+
models: read
53+
54+
jobs:
55+
call-model:
56+
runs-on: ubuntu-latest
57+
steps:
58+
- name: Call AI model
59+
run: |
60+
curl -X POST "https://models.inference.ai.azure.com/chat/completions" \
61+
-H "Content-Type: application/json" \
62+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
63+
-d '{
64+
"messages": [
65+
{
66+
"role": "user",
67+
"content": "Explain the concept of recursion."
68+
}
69+
],
70+
"model": "gpt-4o"
71+
}'
72+
```
73+
3374
## Using AI models from the command line
3475
3576
> [!NOTE] The {% data variables.product.prodname_github_models %} extension for {% data variables.product.prodname_cli %} is in {% data variables.release-phases.public_preview %} and is subject to change.

data/reusables/actions/github-token-available-permissions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ permissions:
88
contents: read|write|none
99
deployments: read|write|none{% ifversion fpt or ghec %}
1010
id-token: write|none{% endif %}
11-
issues: read|write|none
11+
issues: read|write|none{% ifversion not ghes %}
12+
models: read|none{% endif %}
1213
discussions: read|write|none
1314
packages: read|write|none
1415
pages: read|write|none

data/reusables/actions/github-token-scope-descriptions.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ Available permissions and details of what each allows an action to do:
1616
| `id-token` | Fetch an OpenID Connect (OIDC) token. This requires `id-token: write`. For more information, see [AUTOTITLE](/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#updating-your-actions-for-oidc) |
1717
| {% endif %} |
1818
| `issues` | Work with issues. For example, `issues: write` permits an action to add a comment to an issue. For more information, see [AUTOTITLE](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-issues). |
19+
| {% ifversion not ghes %} |
20+
| `models` | Generate AI inference responses with {% data variables.product.prodname_github_models %}. For example, `models: read` permits an action to use the {% data variables.product.prodname_github_models %} inference API. See [AUTOTITLE](/github-models/prototyping-with-ai-models). |
21+
| {% endif %} |
1922
| `packages` | Work with GitHub Packages. For example, `packages: write` permits an action to upload and publish packages on GitHub Packages. For more information, see [AUTOTITLE](/packages/learn-github-packages/about-permissions-for-github-packages#about-scopes-and-permissions-for-package-registries). |
2023
| `pages` | Work with GitHub Pages. For example, `pages: write` permits an action to request a GitHub Pages build. For more information, see [AUTOTITLE](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-pages). |
2124
| `pull-requests` | Work with pull requests. For example, `pull-requests: write` permits an action to add a label to a pull request. For more information, see [AUTOTITLE](/rest/overview/permissions-required-for-github-apps?apiVersion=2022-11-28#repository-permissions-for-pull-requests). |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{% data variables.product.company_short %} bills for {% data variables.product.prodname_advanced_security %} on a per-committer basis. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security).
1+
{% data variables.product.github %} bills for {% data variables.product.prodname_AS %} products on a per-committer basis. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#managing-committers-and-costs).
22

33
You can enforce a policy that controls whether repository administrators are allowed to enable features for {% data variables.product.prodname_advanced_security %} in an organization's repositories. You can configure a policy for all organizations owned by your enterprise account, or for individual organizations that you choose.
44

5-
Disallowing {% data variables.product.prodname_advanced_security %} for an organization prevents repository administrators from enabling {% data variables.product.prodname_advanced_security %} features for additional repositories, but does not disable the features for repositories where the features are already enabled. For more information about configuration of {% data variables.product.prodname_advanced_security %} features, see [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization) or [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository).
5+
Disallowing {% data variables.product.prodname_GH_cs_or_sp %} for an organization prevents repository administrators from enabling {% data variables.product.prodname_GH_cs_or_sp %} features for additional repositories, but does not disable the features for repositories where the features are already enabled.
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1-
1. Optionally, if you chose **Allow for selected organizations**, to the right of an organization, select the dropdown menu to enable {% data variables.product.prodname_advanced_security %} for the organization.
1+
1. Optionally, if you chose **Allow for selected organizations**, to the right of an organization, select the dropdown menu to define which {% data variables.product.prodname_AS %} products are available to the organization.
22

3-
![Screenshot of the dropdown menu to choose a {% data variables.product.prodname_advanced_security %} policy for selected organizations in the enterprise. The dropdown is outlined.](/assets/images/help/enterprises/select-advanced-security-individual-organization-policy.png)
3+
{% ifversion ghas-products %}
4+
5+
![Screenshot of the dropdown menu to choose a {% data variables.product.prodname_AS %} policy for selected organizations in the enterprise. The dropdown is outlined.](/assets/images/help/enterprises/select-advanced-security-individual-organization-policy.png)
6+
7+
{% else %}
8+
9+
![Screenshot of the dropdown menu to choose a {% data variables.product.prodname_AS %} policy for selected organizations in the enterprise. The dropdown is outlined.](/assets/images/help/enterprises/select-advanced-security-individual-organization-policy-ghes-316.png)
10+
11+
{% endif %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1. Under "{% data variables.product.prodname_GH_advanced_security %} availability", select the dropdown menu, then click a policy for the organizations owned by your enterprise.
1+
1. Under "{% data variables.product.prodname_AS %} availability", select the dropdown menu, then click a policy for the organizations owned by your enterprise.

src/search/components/input/AskAIResults.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type AISearchResultEventParams = {
4141
connectedEventId?: string
4242
}
4343

44-
const MAX_REFERENCES_TO_SHOW = 4
44+
const MAX_REFERENCES_TO_SHOW = 5
4545

4646
export function AskAIResults({
4747
query,

src/search/components/input/SearchOverlay.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -745,10 +745,7 @@ export function SearchOverlay({
745745
onClick={async () => {
746746
if (await getIsStaff()) {
747747
// Hubbers users use an internal discussion for feedback
748-
window.open(
749-
'https://github.com/github/docs-engineering/discussions/5295',
750-
'_blank',
751-
)
748+
window.open('https://github.com/github/docs-team/discussions/5172', '_blank')
752749
} else {
753750
// TODO: On ship date set this value
754751
// window.open('TODO', '_blank')

0 commit comments

Comments
 (0)