Skip to content

Commit d2de893

Browse files
authored
Merge pull request #35933 from github/repo-sync
Repo sync
2 parents 04c958c + c6923d6 commit d2de893

File tree

18 files changed

+71
-82
lines changed

18 files changed

+71
-82
lines changed

content/admin/configuring-settings/configuring-github-connect/about-github-connect.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ Additional data is transmitted if you enable individual features of {% data vari
105105
| {% ifversion ghes %} |
106106
| {% data variables.product.prodname_dependabot_alerts %} | Vulnerability alerts | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %} | {% data variables.product.product_name %} |
107107
| {% endif %} |
108-
| {% ifversion dependabot-updates-github-connect %} |
109108
| {% data variables.product.prodname_dependabot_updates %} | Dependencies and the metadata for each dependency's repository<br><br>If a dependency is stored in a private repository on {% data variables.product.prodname_dotcom_the_website %}, data will only be transmitted if {% data variables.product.prodname_dependabot %} is configured and authorized to access that repository. | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %} | {% data variables.product.product_name %} |
110-
| {% endif %} |
111109
| {% data variables.product.prodname_dotcom_the_website %} actions | Name of action, action (YAML file from {% data variables.product.prodname_marketplace %}) | From {% data variables.product.prodname_dotcom_the_website %} to {% data variables.product.product_name %}<br><br>From {% data variables.product.product_name %} to {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.product_name %} |
112110
| {% ifversion server-statistics %} |
113111
| {% data variables.product.prodname_server_statistics %} | Aggregate metrics about your usage of {% data variables.product.prodname_ghe_server %}. For the complete list of metrics, see [AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/analyzing-how-your-team-works-with-server-statistics/about-server-statistics#server-statistics-data-collected). | From {% data variables.product.product_name %} to {% data variables.product.prodname_ghe_cloud %} | {% data variables.product.prodname_ghe_cloud %} |

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ Before you can enable {% data variables.product.prodname_dependabot_alerts %}, y
8787
8888
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).
8989

90-
{% ifversion dependabot-updates-github-connect %}
91-
9290
## Enabling {% data variables.product.prodname_dependabot_updates %}
9391

9492
Before you can enable {% data variables.product.prodname_dependabot_updates %}:
@@ -98,13 +96,9 @@ Before you can enable {% data variables.product.prodname_dependabot_updates %}:
9896

9997
{% data variables.product.prodname_dependabot_updates %} are not supported on {% data variables.product.product_name %} if your enterprise uses clustering.
10098

101-
{% ifversion ghes %}
102-
10399
> [!NOTE]
104100
> After you enable the dependency graph, you can use the [{% data variables.product.prodname_dependabot %} action](https://github.com/github/dependabot-action). The action will raise an error if any vulnerabilities or invalid licenses are being introduced. {% data reusables.actions.action-bundled-actions %}
105101
106-
{% endif %}
107-
108102
{% data reusables.enterprise_site_admin_settings.sign-in %}
109103
{% data reusables.enterprise_site_admin_settings.access-settings %}
110104
{% data reusables.enterprise_site_admin_settings.management-console %}
@@ -116,11 +110,7 @@ Before you can enable {% data variables.product.prodname_dependabot_updates %}:
116110
{% data reusables.enterprise-accounts.access-enterprise %}
117111
{% data reusables.enterprise-accounts.github-connect-tab %}
118112
1. Under "{% data variables.product.prodname_dependabot %}", to the right of "Users can easily upgrade to non-vulnerable open source code dependencies", click **Enable**.
119-
{% endif %}
120-
{% ifversion ghes %}
121113

122114
When you enable {% data variables.product.prodname_dependabot_alerts %}, you should consider also setting up {% data variables.product.prodname_actions %} for {% data variables.product.prodname_dependabot_security_updates %}. This feature allows developers to fix vulnerabilities in their dependencies. For more information, see [AUTOTITLE](/admin/github-actions/enabling-github-actions-for-github-enterprise-server/managing-self-hosted-runners-for-dependabot-updates).
123115

124116
If you need enhanced security, we recommend configuring {% data variables.product.prodname_dependabot %} to use private registries. For more information, see [AUTOTITLE](/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot#configuring-private-registries).
125-
126-
{% endif %}

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Enforcing policies for code security and analysis for your enterprise
3-
intro: 'You can enforce policies to manage the use of {% ifversion security-feature-enablement-policies %}code security and analysis{% else %}{% data variables.product.prodname_GH_advanced_security %}{% endif %} features within your enterprise''s organizations.'
4-
permissions: 'Enterprise owners can enforce {% ifversion security-feature-enablement-policies %}code security and analysis{% endif %} policies for {% data variables.product.prodname_GH_advanced_security %} in an enterprise.'
3+
intro: 'You can enforce policies to manage the use of code security and analysis features within your enterprise''s organizations.'
4+
permissions: 'Enterprise owners can enforce code security and analysis policies for {% data variables.product.prodname_GH_advanced_security %} in an enterprise.'
55
product: '{% data reusables.gated-features.ghas %}'
66
versions:
77
ghec: '*'
@@ -28,22 +28,12 @@ redirect_from:
2828
- /admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise
2929
shortTitle: Code security & analysis
3030
---
31-
{% ifversion security-feature-enablement-policies %}
3231

3332
## About policies for code security and analysis in your enterprise
3433

3534
You can enforce policies to manage the use of code security and analysis features within organizations owned by your enterprise. You can allow or disallow people with admin access to a repository to enable or disable the security and analysis features.
3635

3736
Additionally, you can enforce policies for the use of {% data variables.product.prodname_GH_advanced_security %} in your enterprise's organizations and repositories.
38-
{% else %}
39-
40-
## About policies for {% data variables.product.prodname_GH_advanced_security %} in your enterprise
41-
42-
{% data reusables.advanced-security.ghas-helps-developers %} For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security).
43-
44-
{% ifversion ghes %}If you purchase a license for {% data variables.product.prodname_GH_advanced_security %}, any{% else %}Any{% endif %} organization on {% data variables.product.prodname_ghe_server %} can use {% data variables.product.prodname_advanced_security %} features. You can enforce policies to control how members of your enterprise on {% data variables.product.product_name %} use {% data variables.product.prodname_advanced_security %}.
45-
46-
{% endif %}
4737

4838
{% ifversion ghec %}
4939

@@ -84,16 +74,13 @@ Across all organizations owned by your enterprise, you can allow members with ad
8474
{% data reusables.enterprise.role-permission-hierarchy %}
8575

8676
{% data reusables.enterprise-accounts.access-enterprise %}
87-
{% data reusables.enterprise-accounts.policies-tab %}{% ifversion security-feature-enablement-policies %}
88-
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}{% else %}
89-
{% data reusables.enterprise-accounts.advanced-security-policies %}{% endif %}{% ifversion security-feature-enablement-policies %}
77+
{% data reusables.enterprise-accounts.policies-tab %}
78+
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
9079
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.
9180

92-
{% data reusables.enterprise-accounts.advanced-security-organization-policy-drop-down %}{% endif %}
81+
{% data reusables.enterprise-accounts.advanced-security-organization-policy-drop-down %}
9382
{% data reusables.enterprise-accounts.advanced-security-individual-organization-policy-drop-down %}
9483

95-
{% ifversion security-feature-enablement-policies %}
96-
9784
## Enforcing a policy to manage the use of {% data variables.product.prodname_GH_advanced_security %} features in your enterprise's repositories
9885

9986
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 %}
@@ -114,8 +101,6 @@ Across all of your enterprise's organizations, you can allow or disallow people
114101
{% data reusables.enterprise-accounts.code-security-and-analysis-policies %}
115102
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.
116103

117-
{% endif %}
118-
119104
{% ifversion secret-scanning-ai-generic-secret-detection %}
120105

121106
## 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

content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ You can configure {% data variables.product.prodname_code_scanning %} to run {%
6464

6565
{% data variables.product.product_name %} can run {% data variables.product.prodname_code_scanning %} using a {% data variables.product.prodname_actions %} workflow. First, you need to provision one or more self-hosted {% data variables.product.prodname_actions %} runners in your environment. You can provision self-hosted runners at the repository, organization, or enterprise account level. See [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners) and [AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners).
6666

67-
{% ifversion code-scanning-runner-label or default-setup-self-hosted-runners-GHEC %}
67+
{% ifversion default-setup-self-hosted-runners-GHEC %}
6868
If you are provisioning a self-hosted runner for {% data variables.product.prodname_codeql %} analysis, your runner must use a {% data variables.product.prodname_codeql %}-supported operating system version and CPU architecture. See the [{% data variables.product.prodname_codeql %} system requirements](https://codeql.github.com/docs/codeql-overview/system-requirements/).
6969

7070
If you are using default setup for {% data variables.product.prodname_code_scanning %}, you can assign self-hosted runners {% ifversion code-scanning-default-setup-customize-labels %}with the default `code-scanning` label, or you can optionally give them custom labels so that individual repositories can use different runners.{% else %}with the `code-scanning` label.{% endif %} See [AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning#assigning-labels-to-runners).

content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-dependency-review-for-your-appliance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ shortTitle: Configuring dependency review
44
intro: 'To help users understand dependency changes when reviewing pull requests, you can enable, configure, and disable dependency review for {% data variables.product.prodname_ghe_server %}.'
55
product: '{% data reusables.gated-features.dependency-review %}'
66
versions:
7-
feature: dependency-review-action-ghes
7+
ghes: '*'
88
type: how_to
99
topics:
1010
- Advanced Security

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ topics:
2323

2424
When you enable {% data variables.product.prodname_GH_advanced_security %} for your enterprise, repository administrators in all organizations can enable the features unless you set up a policy to restrict access. See [AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise).
2525

26-
{% ifversion secret-scanning-enterprise-level-api %}{% data reusables.secret-scanning.secret-scanning-enterprise-level-api %}{% endif %}
26+
{% data reusables.secret-scanning.secret-scanning-enterprise-level-api %}
2727

2828
For guidance on a phased deployment of GitHub Advanced Security, see [AUTOTITLE](/code-security/adopting-github-advanced-security-at-scale/introduction-to-adopting-github-advanced-security-at-scale).
2929

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ title: Managing GitHub Advanced Security features for your enterprise
33
intro: 'You can control {% data variables.product.prodname_GH_advanced_security %} features that secure and analyze code across all organizations owned by your enterprise.'
44
permissions: 'Enterprise owners can manage {% data variables.product.prodname_advanced_security %} features for organizations in an enterprise.'
55
versions:
6-
feature: secret-scanning-enterprise-level
6+
ghec: '*'
7+
ghes: '*'
78
type: how_to
89
topics:
910
- Alerts
@@ -31,7 +32,7 @@ To manage individual {% data variables.product.prodname_GH_advanced_security %}
3132
3233
{% endif %}
3334

34-
{% ifversion secret-scanning-enterprise-level-api %}{% data reusables.secret-scanning.secret-scanning-enterprise-level-api %}{% endif %}
35+
{% data reusables.secret-scanning.secret-scanning-enterprise-level-api %}
3536

3637
{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security).{% endif %}
3738

content/admin/managing-github-actions-for-your-enterprise/enabling-github-actions-for-github-enterprise-server/managing-self-hosted-runners-for-dependabot-updates.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,11 @@ To use {% data variables.product.prodname_dependabot_updates %} on {% data varia
2323

2424
## Prerequisites
2525

26-
{% ifversion dependabot-updates-github-connect %}
2726
Configuring self-hosted runners is only one step in the middle of the process for enabling {% data variables.product.prodname_dependabot_updates %}. There are several steps you must follow before these steps, including configuring {% data variables.location.product_location %} to use {% data variables.product.prodname_actions %} with self-hosted runners. For more information, see [AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise).
28-
{% else %}
29-
Before you configure self-hosted runners for {% data variables.product.prodname_dependabot_updates %}, you must:
30-
31-
* Configure {% data variables.location.product_location %} to use {% data variables.product.prodname_actions %} with self-hosted runners. For more information, see [AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server).
32-
* Enable {% data variables.product.prodname_dependabot_alerts %} for your enterprise. For more information, see [AUTOTITLE](/admin/configuration/configuring-github-connect/enabling-dependabot-for-your-enterprise).
33-
{% endif %}
3427

3528
## Configuring self-hosted runners for {% data variables.product.prodname_dependabot_updates %}
3629

37-
## # System requirements for {% data variables.product.prodname_dependabot %} runners
30+
### System requirements for {% data variables.product.prodname_dependabot %} runners
3831

3932
{% data reusables.dependabot.dependabot-runners-system-requirements %}
4033

content/admin/monitoring-and-managing-your-instance/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity.md

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,41 @@ Root storage refers to the total size of your instance's root disk. The availabl
6969
> Before increasing the root partition size, you must put your instance in maintenance mode. For more information, see [AUTOTITLE](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode).
7070
7171
1. Attach a new disk to your {% data variables.product.prodname_ghe_server %} appliance.
72-
1. Run the `lsblk` command to identify the new disk's device name.
72+
1. Run the `lsblk` command to identify the new disk's device name.{% ifversion ghes > 3.13 %}
73+
1. Back up your existing EFI boot partition:
74+
75+
```shell
76+
sudo dd if=/dev/disk/by-label/EFIBOOT of=EFIBOOT.bak bs=1M
77+
```
78+
79+
{% endif %}
80+
7381
1. Run the `parted` command to format the disk, substituting your device name for `/dev/xvdg`:
7482

83+
{% ifversion ghes < 3.14 %}
84+
7585
```shell
7686
sudo parted /dev/xvdg mklabel msdos
7787
sudo parted /dev/xvdg mkpart primary ext4 0% 50%
7888
sudo parted /dev/xvdg mkpart primary ext4 50% 100%
7989
```
8090

91+
{% else %}
92+
93+
```shell
94+
sudo parted /dev/xvdg mklabel gpt
95+
sudo parted -a optimal /dev/xvdg mkpart bios fat32 1MiB 2MiB
96+
sudo parted /dev/xvdg set 1 bios_grub on
97+
sudo parted -a optimal /dev/xvdg mkpart efi fat32 2MiB 512MiB
98+
sudo parted /dev/xvdg set 2 esp on
99+
sudo parted -a optimal /dev/xvdg mkpart primary 512MiB 50%
100+
sudo parted /dev/xvdg set 3 boot off
101+
sudo parted /dev/xvdg set 3 esp off
102+
sudo parted -a optimal /dev/xvdg mkpart primary 50% 100%
103+
```
104+
105+
{% endif %}
106+
81107
1. If your appliance is configured for high-availability or geo-replication, to stop replication run the `ghe-repl-stop` command on each replica node:
82108

83109
```shell
@@ -86,6 +112,8 @@ Root storage refers to the total size of your instance's root disk. The availabl
86112

87113
1. To install the {% data variables.product.prodname_ghe_server %} software on the newly partitioned disk, run the `ghe-upgrade` command. You must replace **PACKAGE-NAME.pkg** with the path to a platform-specific upgrade package that matches the version of {% data variables.product.prodname_ghe_server %} already running on the appliance. You cannot use a universal hotpatch upgrade package, such as `github-enterprise-2.11.9.hpkg`. After the `ghe-upgrade` command completes, application services will automatically terminate.
88114

115+
{% ifversion ghes < 3.14 %}
116+
89117
```shell
90118
ghe-upgrade PACKAGE-NAME.pkg -s -t /dev/xvdg1
91119
```
@@ -96,6 +124,21 @@ Root storage refers to the total size of your instance's root disk. The availabl
96124
sudo mkfs.ext4 -L fallback /dev/xvdg2
97125
```
98126

127+
{% else %}
128+
129+
```shell
130+
ghe-upgrade PACKAGE-NAME.pkg -s -t /dev/xvdg3
131+
```
132+
133+
1. Run these commands on the secondary partitions of the newly added disk:
134+
135+
```shell
136+
sudo dd if=/dev/disk/by-label/EFIBOOT of=/dev/xvdg2 bs=1M
137+
sudo mkfs.ext4 -L fallback /dev/xvdg4
138+
```
139+
140+
{% endif %}
141+
99142
1. Shut down the appliance:
100143

101144
```shell

content/code-security/secret-scanning/enabling-secret-scanning-features/enabling-push-protection-for-your-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you're an organization owner, you can enable push protection for multiple rep
3636

3737
Organization owners, security managers, and repository administrators can also enable push protection for {% data variables.product.prodname_secret_scanning %} via the API. For more information, see [AUTOTITLE](/rest/repos#update-a-repository) and expand the "Properties of the `security_and_analysis` object" section.
3838

39-
{% ifversion secret-scanning-enterprise-level %}
39+
{% ifversion ghec or ghes %}
4040

4141
If your organization is owned by an enterprise account, an enterprise owner can also enable push protection at the enterprise level. For more information, see [AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise).
4242

0 commit comments

Comments
 (0)