Skip to content

Commit 01a07eb

Browse files
authored
Merge pull request github#36722 from github/repo-sync
Repo sync
2 parents 9c45512 + 723fbce commit 01a07eb

File tree

66 files changed

+135
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+135
-105
lines changed

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/managing-security-and-analysis-settings-for-your-personal-account.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ For an overview of repository-level security, see [AUTOTITLE](/code-security/get
3232

3333
{% data reusables.user-settings.access_settings %}
3434
{% data reusables.user-settings.security-analysis %}
35-
1. Under {% ifversion code-security-wording-only %}"Code security"{% else %}"Code security and analysis"{% endif %}, to the right of the feature, click **Disable all** or **Enable all**.
35+
1. Under "{% data variables.product.UI_advanced_security %}", to the right of the feature, click **Disable all** or **Enable all**.
3636
1. Optionally, enable the feature by default for new repositories that you own.{% ifversion not ghes %}
3737

3838
![Screenshot of the "Enable FEATURE" modal dialog, with the "Enable by default for new private repositories" option outlined in dark orange.](/assets/images/help/settings/security-and-analysis-enable-by-default-in-modal.png){% endif %}
@@ -45,7 +45,7 @@ For an overview of repository-level security, see [AUTOTITLE](/code-security/get
4545

4646
{% data reusables.user-settings.access_settings %}
4747
{% data reusables.user-settings.security-analysis %}
48-
1. Under {% ifversion code-security-wording-only %}"Code security"{% else %}"Code security and analysis"{% endif %}, to the right of the feature, enable or disable the feature by default for new repositories that you own.
48+
1. Under "{% data variables.product.UI_advanced_security %}", to the right of the feature, enable or disable the feature by default for new repositories that you own.
4949

5050
## Further reading
5151

content/admin/configuring-settings/configuring-github-connect/enabling-dependabot-for-your-enterprise.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Before you can enable {% data variables.product.prodname_dependabot_alerts %}, y
8383
> [!TIP]
8484
> We recommend configuring {% data variables.product.prodname_dependabot_alerts %} without notifications for the first few days to avoid an overload of realtime notifications. After a few days, you can enable notifications to receive {% data variables.product.prodname_dependabot_alerts %} as usual.
8585
86-
You can now enable {% data variables.product.prodname_dependabot_alerts %} for all existing or new private and internal repositories in the enterprise settings page for {% ifversion code-security-wording-only-enterprise %}"Code security."{% else %}"Code security and analysis."{% endif %} Alternatively, repository administrators and organization owners can enable {% data variables.product.prodname_dependabot_alerts %} for each repository and organization. Public repositories are always enabled by default. For more information, see [AUTOTITLE](/enterprise-server@latest/code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts).
86+
You can now enable {% data variables.product.prodname_dependabot_alerts %} for all existing or new private and internal repositories in the enterprise settings page for "{% data variables.product.UI_advanced_security_ent %}." Alternatively, repository administrators and organization owners can enable {% data variables.product.prodname_dependabot_alerts %} for each repository and organization. Public repositories are always enabled by default. For more information, see [AUTOTITLE](/enterprise-server@latest/code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts).
8787

8888
## Enabling {% data variables.product.prodname_dependabot_updates %}
8989

content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ When you enable one or more security and analysis features for existing reposito
4848

4949
{% data reusables.enterprise-accounts.access-enterprise %}
5050
{% data reusables.enterprise-accounts.settings-tab %}
51-
1. In the left sidebar, click **Code security and analysis**.
51+
{% data reusables.enterprise-accounts.advanced-security-tab %}
5252
1. Optionally, enable or disable a feature for all existing repositories.
5353

5454
* To the right of the feature, click **Disable all** or **Enable all**. If the control for "{% data variables.product.prodname_GH_advanced_security %}" is disabled, you have no available licenses for {% data variables.product.prodname_GH_advanced_security %}.

content/admin/managing-code-security/securing-your-enterprise/applying-a-custom-security-configuration-to-your-enterprise.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ After you create a {% data variables.product.prodname_custom_security_configurat
2121

2222
{% data reusables.enterprise-accounts.access-enterprise %}
2323
{% data reusables.enterprise-accounts.settings-tab %}
24-
1. In the left sidebar, click **Code security**.
24+
{% data reusables.enterprise-accounts.advanced-security-tab %}
2525
1. To the right of the configuration you want to apply, select the **Apply to** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **All repositories** or **All repositories without configurations**.
2626
{% data reusables.security-configurations.apply-configuration-by-default %}
2727

content/admin/managing-code-security/securing-your-enterprise/applying-the-github-recommended-security-configuration-to-your-enterprise.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The {% data variables.product.prodname_github_security_configuration %} is a set
2121

2222
{% data reusables.enterprise-accounts.access-enterprise %}
2323
{% data reusables.enterprise-accounts.settings-tab %}
24-
1. In the left sidebar, click **Code security**.
24+
{% data reusables.enterprise-accounts.advanced-security-tab %}
2525
1. In the "{% data variables.product.company_short %} recommended" row of the configurations table for your enterprise, select the **Apply to** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **All repositories** or **All repositories without configurations**.
2626
{% data reusables.security-configurations.apply-configuration-by-default %}
2727

@@ -33,7 +33,7 @@ The {% data variables.product.prodname_github_security_configuration %} is a set
3333

3434
{% data reusables.enterprise-accounts.access-enterprise %}
3535
{% data reusables.enterprise-accounts.settings-tab %}
36-
1. In the left sidebar, click **Code security**.
36+
{% data reusables.enterprise-accounts.advanced-security-tab %}
3737
1. In the "Configurations" section, select "{% data variables.product.company_short %} recommended".
3838
1. In the "Policy" section, next to "Enforce configuration", select **Enforce** from the dropdown menu.
3939

content/admin/managing-code-security/securing-your-enterprise/configuring-additional-secret-scanning-settings-for-your-enterprise.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ These additional settings only apply to repositories with {% data variables.prod
2424

2525
{% data reusables.enterprise-accounts.access-enterprise %}
2626
{% data reusables.enterprise-accounts.settings-tab %}
27-
1. In the left sidebar, click **Code security**.
27+
{% data reusables.enterprise-accounts.advanced-security-tab %}
2828
1. Scroll down the page to the "Additional settings" section.
2929

3030
### Configuring a resource link for push protection

content/admin/managing-code-security/securing-your-enterprise/creating-a-custom-security-configuration-for-your-enterprise.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ When creating a security configuration, keep in mind that:
4040
4141
{% data reusables.enterprise-accounts.access-enterprise %}
4242
{% data reusables.enterprise-accounts.settings-tab %}
43-
1. In the left sidebar, click **Code security**.
43+
{% data reusables.enterprise-accounts.advanced-security-tab %}
4444
1. In the "Configurations" section, click **New configuration**.
4545
1. To help identify your {% data variables.product.prodname_custom_security_configuration %} and clarify its purpose on the "Configurations" page, name your configuration and create a description.
4646
1. In the "{% data variables.product.prodname_GH_advanced_security %} features" row, choose whether to include or exclude {% data variables.product.prodname_GH_advanced_security %} (GHAS) features. If you plan to apply a {% data variables.product.prodname_custom_security_configuration %} with GHAS features to private repositories, you must have available GHAS licenses for each active unique committer to those repositories, or the features will not be enabled. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).
@@ -73,7 +73,7 @@ When creating a security configuration, keep in mind that:
7373
7474
{% data reusables.enterprise-accounts.access-enterprise %}
7575
{% data reusables.enterprise-accounts.settings-tab %}
76-
1. In the left sidebar, click **Code security**.
76+
{% data reusables.enterprise-accounts.advanced-security-tab %}
7777
1. In the "Configurations" section, click **New configuration**.
7878
1. To help identify your {% data variables.product.prodname_custom_security_configuration %} and clarify its purpose on the "Configurations" page, name your configuration and create a description.
7979
1. In the "{% data variables.product.prodname_GH_advanced_security %} features" row, choose whether to include or exclude {% data variables.product.prodname_GH_advanced_security %} (GHAS) features. If you plan to apply a {% data variables.product.prodname_custom_security_configuration %} with GHAS features to private repositories, you must have available GHAS licenses for each active unique committer to those repositories, or the features will not be enabled. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).

content/admin/managing-code-security/securing-your-enterprise/deleting-a-custom-security-configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ If you no longer need a {% data variables.product.prodname_custom_security_confi
2222

2323
{% data reusables.enterprise-accounts.access-enterprise %}
2424
{% data reusables.enterprise-accounts.settings-tab %}
25-
1. In the left sidebar, click **Code security**.
25+
{% data reusables.enterprise-accounts.advanced-security-tab %}
2626
1. In the configurations table, click the name of the {% data variables.product.prodname_custom_security_configuration %} you want to delete.
2727
1. In the "Edit configuration" page, scroll to the bottom of the "Policy" section, then click **Delete configuration**.
2828
1. Ensure you read the warning in the "Delete this configuration?" dialog, to confirm you are comfortable deleting the {% data variables.product.prodname_custom_security_configuration %}, then click **Delete configuration**.

content/admin/managing-code-security/securing-your-enterprise/editing-a-custom-security-configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ After creating and applying a {% data variables.product.prodname_custom_security
2626

2727
{% data reusables.enterprise-accounts.access-enterprise %}
2828
{% data reusables.enterprise-accounts.settings-tab %}
29-
1. In the left sidebar, click **Code security**.
29+
{% data reusables.enterprise-accounts.advanced-security-tab %}
3030
1. In the "Configurations" section, click the name of the {% data variables.product.prodname_custom_security_configuration %} you want to edit.
3131
1. Edit the name and description of your {% data variables.product.prodname_custom_security_configuration %} as desired.
3232
1. In the "Security settings" section, edit the enablement settings of your {% data variables.product.prodname_custom_security_configuration %} as desired.

content/admin/release-notes.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: Release notes
33
layout: release-notes
4+
intro: 'Detailed information for all releases of the currently selected version of {% data variables.product.prodname_ghe_server %}.'
45
versions:
56
ghes: '*'
67
topics:

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ You can view the enterprise account's current license limits and usage.
7474
* Click the name of the organization.
7575

7676
{% ifversion ghec %}
77-
* On the "Code security & analysis" settings page, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section to see an overview of your organization's license usage, as well as a detailed breakdown of usage by repository for this organization.
77+
* On the "{% data variables.product.UI_advanced_security_ent %}" settings page, scroll to the "{% data variables.product.prodname_GH_advanced_security %} repositories" section to see an overview of your organization's license usage, as well as a detailed breakdown of usage by repository for this organization.
7878

7979
For more information, see [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization).
8080

@@ -111,7 +111,7 @@ You can download the {% data variables.product.prodname_advanced_security %} lic
111111

112112
{% data reusables.profile.access_org %}
113113
{% data reusables.profile.org_settings %}
114-
1. In the "Security" section of the sidebar, select the **Code security** dropdown menu, then click **{% data variables.product.prodname_global_settings_caps %}**.
114+
1. In the "Security" section of the sidebar, select the {% data variables.product.UI_advanced_security %} dropdown menu, then click **{% data variables.product.prodname_global_settings_caps %}**.
115115
1. In the "{% data variables.product.prodname_GH_advanced_security %} repositories" section, next to the repository you want usage information for, select {% octicon "kebab-horizontal" aria-label="GHAS repository actions" %}, then click **Download CSV report**.
116116

117117
![Screenshot of the committers by repository table. The horizontal kebab icon and "Download CSV report" button are highlighted with an orange outline.](/assets/images/help/billing/ghas-billing-table-repository-csv.png)

content/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ You can customize your {% data variables.product.prodname_codeql %} analysis by
6868
> [!NOTE]
6969
> If you are switching from default setup to advanced setup, in the "{% data variables.product.prodname_code_scanning_caps %}" section, select {% octicon "kebab-horizontal" aria-label="Menu" %}, then click **{% octicon "workflow" aria-hidden="true" %} Switch to advanced**. In the pop-up window that appears, click **Disable {% data variables.product.prodname_codeql %}**.
7070
71-
![Screenshot of the "{% data variables.product.prodname_code_scanning_caps %}" section of {% ifversion code-security-wording-only %}"Code security"{% else %}"Code security and analysis"{% endif %} settings. The "Advanced setup" button is highlighted with an orange outline.](/assets/images/help/security/advanced-code-scanning-setup.png)
71+
![Screenshot of the "{% data variables.product.prodname_code_scanning_caps %}" section of "{% data variables.product.UI_advanced_security %}" settings. The "Advanced setup" button is highlighted with an orange outline.](/assets/images/help/security/advanced-code-scanning-setup.png)
7272

7373
1. To customize how {% data variables.product.prodname_code_scanning %} scans your code, edit the workflow.
7474

content/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning-at-scale.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ When a repository uses code stored in a private registry, default setup needs ac
7575

7676
{% ifversion security-configurations %} You can enable default setup for all eligible repositories in your organization. For more information, see [AUTOTITLE](/code-security/securing-your-organization/introduction-to-securing-your-organization-at-scale/about-enabling-security-features-at-scale).
7777
{% else %}
78-
Through the "Code security and analysis" page of your organization's settings, you can enable default setup for all eligible repositories in your organization. For more information on repository eligibility, see [Eligible repositories for {% data variables.product.prodname_codeql %} default setup at scale](#eligible-repositories-default-setup).
78+
Through the "{% data variables.product.UI_advanced_security %}" page of your organization's settings, you can enable default setup for all eligible repositories in your organization. For more information on repository eligibility, see [Eligible repositories for {% data variables.product.prodname_codeql %} default setup at scale](#eligible-repositories-default-setup).
7979

8080
{% data reusables.profile.access_org %}
8181
{% data reusables.profile.org_settings %}

content/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Configuring default setup for code scanning
33
shortTitle: Configure code scanning
4-
intro: 'You can quickly secure code in your repository with default setup for {% data variables.product.prodname_code_scanning %}.'
4+
intro: 'Quickly set up {% data variables.product.prodname_code_scanning %} to find {% ifversion fpt or ghec %}and fix {% endif %}vulnerable code automatically.'
55
redirect_from:
66
- /github/managing-security-vulnerabilities/configuring-automated-code-scanning
77
- /github/finding-security-vulnerabilities-and-errors-in-your-code/enabling-code-scanning
@@ -88,7 +88,7 @@ Compiled languages are not automatically included in default setup configuration
8888
{% data reusables.user-settings.security-analysis %}
8989
1. In the "{% data variables.product.prodname_code_scanning_caps %}" section, select **Set up** {% octicon "triangle-down" aria-hidden="true" %}, then click **Default**.
9090

91-
![Screenshot of the "{% data variables.product.prodname_code_scanning_caps %}" section of {% ifversion code-security-wording-only %}"Code security"{% else %}"Code security and analysis"{% endif %} settings. The "Default setup" button is highlighted with an orange outline.](/assets/images/help/security/default-code-scanning-setup.png)
91+
![Screenshot of the "{% data variables.product.prodname_code_scanning_caps %}" section of "{% data variables.product.UI_advanced_security %}" settings. The "Default setup" button is highlighted with an orange outline.](/assets/images/help/security/default-code-scanning-setup.png)
9292

9393
You will then see a "{% data variables.product.prodname_codeql %} default configuration" dialog summarizing the {% data variables.product.prodname_code_scanning %} configuration automatically created by default setup.
9494

content/code-security/code-scanning/managing-code-scanning-alerts/disabling-autofix-for-code-scanning.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Note that disabling {% data variables.product.prodname_copilot_autofix_short %}
4545

4646
{% data reusables.profile.access_org %}
4747
{% data reusables.profile.org_settings %}
48-
1. In the "Security" section of the sidebar, click **{% octicon "codescan" aria-hidden="true" %} Code security** then **Global settings**.
48+
{% data reusables.security-configurations.display-global-settings %}
4949
1. Under the "{% data variables.product.prodname_code_scanning_caps %}" section, deselect **{% data variables.product.prodname_copilot_autofix_short %}** or **{% data variables.product.prodname_copilot_autofix_short %} for third-party tools**.
5050

5151
For more information about configuring global {% data variables.product.prodname_code_scanning %} settings, see [AUTOTITLE](/code-security/securing-your-organization/enabling-security-features-in-your-organization/configuring-global-security-settings-for-your-organization#configuring-global-code-scanning-settings).

content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ For more information about {% data variables.product.prodname_codeql %} model pa
105105
{% data reusables.profile.access_org %}
106106
{% data reusables.organizations.org_settings %}
107107
{% ifversion security-configurations %}
108-
1. Click **Code security** then **Global settings**.
108+
{% data reusables.security-configurations.display-global-settings %}
109109
{% else %}
110-
1. Click **Code security and analysis**.
110+
1. Click **{% data variables.product.UI_advanced_security %}**.
111111
{% endif %}
112112
1. Find the "{% data variables.product.prodname_code_scanning_caps %}" section.
113113
1. Next to "Expand {% data variables.product.prodname_codeql %} analysis", click **Configure**.

content/code-security/code-scanning/troubleshooting-code-scanning/enabling-default-setup-takes-too-long.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ When you enable default setup, a workflow is triggered with the automatically ge
1313

1414
You can check on the progress of the test run for default setup on the **Actions** tab. If the run is taking too long, try canceling the workflow run and restarting the configuration process.
1515

16-
To restart your configuration, navigate to the main page of your repository, then click **{% octicon "play" aria-hidden="true" %} Actions**. Click the **{% data variables.product.prodname_codeql %}** workflow run that's in progress, then click **Cancel workflow**. Once {% octicon "stop" aria-label="cancelled" %} appears beside the workflow run name, navigate back to the {% ifversion code-security-wording-only %}**Code security**{% else %}**Code security and analysis**{% endif %} settings and re-enable default setup. If default setup continues to stall, please contact {% data variables.contact.contact_support %} or try enabling advanced setup. For more information, see [AUTOTITLE](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning).
16+
To restart your configuration, navigate to the main page of your repository, then click **{% octicon "play" aria-hidden="true" %} Actions**. Click the **{% data variables.product.prodname_codeql %}** workflow run that's in progress, then click **Cancel workflow**. Once {% octicon "stop" aria-label="cancelled" %} appears beside the workflow run name, navigate back to the **{% data variables.product.UI_advanced_security %}** settings and re-enable default setup. If default setup continues to stall, please contact {% data variables.contact.contact_support %} or try enabling advanced setup. For more information, see [AUTOTITLE](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning).

0 commit comments

Comments
 (0)