Skip to content

Commit 334dfb4

Browse files
Merge branch 'main' into patch-1
2 parents 6e6e933 + 41d1469 commit 334dfb4

File tree

63 files changed

+674
-884
lines changed

Some content is hidden

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

63 files changed

+674
-884
lines changed

content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-governance.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Rulesets allow you to flexibly target the organizations, repositories, and branc
2929

3030
* To target **organizations**, you can select all, choose from a list, define a dynamic pattern for organization names using `fnmatch` syntax, or use organization custom properties to dynamically target organizations based on metadata. For syntax details, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/creating-rulesets-for-a-repository#using-fnmatch-syntax). For information on custom properties, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/custom-properties).
3131

32-
* Within those organizations, you can target all **repositories**, or target a dynamic list by custom property. See [AUTOTITLE](/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization).
32+
* Within those organizations, you can target all **repositories**, or target a dynamic list by custom property or deployment context.
3333
* Within the repositories, you can target certain **branches or tags**: all branches, the default branch, or a dynamic list using `fnmatch` syntax.
3434

3535
When you create a ruleset that targets branches in a repository, repository administrators can no longer rename branches or change the default branch in the targeted repository. They can still create and delete branches if they have the appropriate permissions.
@@ -78,7 +78,12 @@ If you set a dynamic list, you'll add one or more naming patterns using `fnmatch
7878

7979
### Choosing which repositories to target in your enterprise
8080

81-
Within the selected organizations, you can target all repositories or target a dynamic list by custom property. See [AUTOTITLE](/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization).
81+
Within the selected organizations, you can target all repositories or target a dynamic list based on a filter:
82+
83+
* You can filter by custom property. See [AUTOTITLE](/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization).
84+
{%- ifversion virtual-registry %}
85+
* {% data reusables.security.deployable-rulesets %}
86+
{%- endif %}
8287

8388
### Choosing which branches or tags to target
8489

content/billing/concepts/product-billing/github-copilot-licenses.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ There are several ways to use {% data variables.product.prodname_copilot_short %
4040
* Intended for **individual use only** (not suitable for organizations or enterprises).
4141
* For usage beyond the free plan limits, upgrade to {% data variables.copilot.copilot_pro_short %}.
4242

43-
### 30-day trial for {% data variables.copilot.copilot_pro_short %}
44-
45-
* Before starting a paid plan for a personal account, you can activate a **one-time 30-day trial**. [Start using {% data variables.copilot.copilot_free_short %}](https://github.com/copilot).
46-
* You must provide a payment method.
47-
* If you do not cancel before the end of the trial, it automatically converts to a paid plan.
48-
* You can cancel any time during the 30 days. If you cancel, you will not be charged and will keep access until the trial ends.
49-
* Free trials are limited to three per payment method. Additional trials will continue as paid subscriptions.
50-
5143
### Educational and open source benefits
5244

5345
* {% data variables.copilot.copilot_student_short %} offers free access to {% data variables.product.prodname_copilot_short %}'s premium features for verified students. See [AUTOTITLE](/copilot/how-tos/manage-your-account/free-access-with-copilot-student).

content/code-security/concepts/supply-chain-security/linked-artifacts.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ The {% data variables.product.virtual_registry %} provides a unified view of sof
1313

1414
The page shows you how an artifact was built, where it is stored or running, and which compliance and security metadata is associated with the artifact.
1515

16-
Teams in your organization can use the {% data variables.product.virtual_registry %} to:
16+
Teams in your organization can use data from the {% data variables.product.virtual_registry %} to:
1717

1818
* Prioritize alerts from {% data variables.product.prodname_GHAS %} features based on whether the detected vulnerabilities are running in production or exposed to the internet
1919
* Quickly connect artifacts to build details, storage locations, and owning teams
2020
* Meet compliance by exporting auditable proof of your artifacts' provenance and integrity
21+
* Find repositories that are associated with a deployed artifact, and target them in branch rulesets
2122

2223
## Which artifacts appear on the {% data variables.product.virtual_registry %}?
2324

@@ -43,12 +44,20 @@ For more information about attestations and SLSA levels, see [AUTOTITLE](/action
4344

4445
### Deployment records
4546

46-
Deployment records include the environment where the artifact is deployed and any runtime risks (such as "sensitive data" or "internet exposed") associated with the artifact. You can use this data to filter security alerts based on the level of threat posed to your organization and consumers.
47+
Deployment records include the environment where the artifact is deployed and any runtime risks (such as "sensitive data" or "internet exposed") associated with the artifact.
4748

4849
![Screenshot of an artifact page. Highlighted fields: the "Deployments" list, including tags for "Prod", "sensitive data", and "pacific-east".](/assets/images/help/security/virtual-registry-deployment-record.png)
4950

5051
>[!NOTE] Deployment records do **not** include deployment activity from a repository's deployments dashboard, which comes from a different source. See [AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/viewing-deployment-activity-for-your-repository).
5152
53+
## Where is artifact data available?
54+
55+
As well as being available on the {% data variables.product.virtual_registry %} itself, artifact metadata is integrated into policy and security surfaces on {% data variables.product.github %}. Teams can use this data to make policy decisions or prioritize security issues. For example, they can:
56+
57+
* Use `deployed` or `deployable` filters to search for repositories or target repositories in organization and enterprise rulesets. See [AUTOTITLE](/search-github/searching-on-github/searching-for-repositories#search-based-on-deployment-context).
58+
* Filter security campaigns, {% data variables.product.prodname_code_scanning %} alerts, and {% data variables.product.prodname_dependabot %} alerts by runtime risk. See [AUTOTITLE](/code-security/tutorials/secure-your-organization/prioritize-alerts-in-production-code).
59+
* View runtime risks as attributes on individual {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} alerts.
60+
5261
## How does the {% data variables.product.virtual_registry %} fit into my processes?
5362

5463
This example workflow shows how the {% data variables.product.virtual_registry %} integrates with other {% data variables.product.github %} features and external systems.

content/code-security/reference/supply-chain-security/dependabot-options-reference.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,6 @@ Reviewers must have at least read access to the repository.
682682
| {% endif %} |
683683
| [`timezone`](#timezone) | Specify the timezone of the `time` value. |
684684

685-
{% ifversion fpt or ghec %}
686-
687685
### `interval`
688686

689687
Supported values: `daily`, `weekly`, `monthly`, `quarterly`, `semiannually`, `yearly`, or `cron`
@@ -698,22 +696,12 @@ Each package manager **must** define a schedule interval.
698696
* Use `yearly` to run on the first day of January.
699697
* Use `cron` for cron expression based scheduling option. See [`cronjob`](#cronjob).
700698

701-
{% elsif ghes %}
702-
703-
### `interval`
704-
705-
Supported values: `daily`, `weekly`, `monthly`{% ifversion dependabot-schedule-updates %}, or `cron`{% endif %}
706-
707-
Each package manager **must** define a schedule interval.
699+
>[!NOTE]
700+
> The supported values `quarterly`, `semiannually`, and `yearly` are only available on {% data variables.product.prodname_ghe_server %} from version 3.19.
708701

709-
* Use `daily` to run on every weekday, Monday to Friday.
710-
* Use `weekly` to run once a week, by default on Monday.
711-
* Use `monthly` to run on the first day of each month.{% ifversion dependabot-schedule-updates %}
712-
* Use `cron` for cron expression based scheduling option. See [`cronjob`](#cronjob).{% endif %}
702+
By default, {% data variables.product.prodname_dependabot %} randomly assigns a time to apply all the updates in the configuration file. You can use the `time` and `timezone` parameters to set a specific runtime for all intervals. {% ifversion dependabot-schedule-updates %}If you use a `cron` interval, you can define the update time with a `cronjob` expression.{% endif %}
713703

714-
{% endif %}
715704

716-
By default, {% data variables.product.prodname_dependabot %} randomly assigns a time to apply all the updates in the configuration file. You can use the `time` and `timezone` parameters to set a specific runtime for all intervals. {% ifversion dependabot-schedule-updates %}If you use a `cron` interval, you can define the update time with a `cronjob` expression.{% endif %}
717705

718706
### `day`
719707

content/code-security/tutorials/secure-your-organization/prioritize-alerts-in-production-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To provide production context, you should configure your system to:
2525
* Update **storage records** in the {% data variables.product.virtual_registry %} whenever an artifact is promoted to a production-approved package repository.
2626
* Update **deployment records** when an artifact is deployed to a production environment.
2727

28-
{% data variables.product.github %} processes this metadata and uses it to power alert filters, such as `artifact-registry-url` and `artifact-registry` from storage records, and `has:deployment` and `runtime-risk` from deployment records.
28+
{% data variables.product.github %} processes this metadata and uses it to power alert filters, such as `artifact-registry-url` and `artifact-registry` from storage records, and `has:deployment` and `runtime-risk` from deployment records. Runtime risks from deployment records are also visible as properties on individual {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_dependabot %} alert pages.
2929

3030
For more information on updating records, see [AUTOTITLE](/code-security/how-tos/secure-your-supply-chain/establish-provenance-and-integrity/upload-linked-artifacts).
3131

content/copilot/concepts/billing/billing-for-individuals.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,9 @@ category:
3131

3232
{% ifversion fpt %}
3333

34-
### About the 30-day trial for {% data variables.copilot.copilot_pro_short %}
34+
> [!NOTE] {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} are paid plans. Billing starts when you subscribe. If you already have a billing cycle, charges are prorated and included in your next bill.
3535
36-
> [!NOTE] {% data variables.copilot.copilot_pro_plus_short %} does not include a trial. You will be billed immediately upon subscribing.
37-
38-
Before starting a paid plan for a personal account, you can set up a one-time {% data reusables.copilot.trial-period %}-day trial to evaluate {% data variables.product.prodname_copilot_short %}. To begin a trial, you will need to provide a payment method. If you do not cancel the trial before the end of the {% data reusables.copilot.trial-period %} days, the trial will automatically convert to a paid plan.
39-
40-
You can cancel your {% data variables.product.prodname_copilot_short %} trial at any time during the {% data reusables.copilot.trial-period %} days and you won't be charged. If you cancel before the end of the trial, you will continue to have access to {% data variables.product.prodname_copilot_short %} until the {% data reusables.copilot.trial-period %}-day trial period ends. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/canceling-your-copilot-trial-as-an-individual-user).
41-
42-
{% data reusables.copilot.tp-users-trial-eligibility %}{% endif %}
36+
{% endif %}
4337

4438
## About premium requests
4539

@@ -71,7 +65,7 @@ You can cancel your {% data variables.product.prodname_copilot_short %} plan at
7165
Your billing date will depend on whether or not you are already being billed by {% data variables.product.prodname_dotcom %}.
7266

7367
* **If you are not already being billed by {% data variables.product.prodname_dotcom %}**, in most cases your billing cycle will start on the day you sign up for {% data variables.product.prodname_copilot_short %}. For example, if you sign up on 3 September, with monthly billing, your initial billing cycle will run from 3 September until and including 2 October, and then on the same days of subsequent months.
74-
* **If you already have a billing cycle**, billing for {% data variables.product.prodname_copilot_short %} will be included in your next bill, or your first bill after the end of your 30-day {% data variables.product.prodname_copilot_short %} trial. You will be charged on a pro rata basis for that initial period. If you do not already have an established billing date, you will be billed for {% data variables.copilot.copilot_pro_short %} at the end of your 30-day trial, or when you set up a new paid {% data variables.product.prodname_copilot_short %} plan.
68+
* **If you already have a billing cycle**, billing for {% data variables.product.prodname_copilot_short %} will be included in your next bill. You will be charged on a pro rata basis for that initial period.
7569

7670
## Further reading
7771

content/copilot/get-started/choose-enterprise-plan.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,9 @@ For more information on managing spending on premium requests, see [AUTOTITLE](/
6565

6666
## Getting started
6767

68-
When you've determined whether premium requests and {% data variables.copilot.copilot_enterprise_short %} features will help you achieve your goals, it's time to choose a plan.
68+
When you've determined whether premium requests and {% data variables.copilot.copilot_enterprise_short %} features will help you achieve your goals, it's time to choose a plan. Contact our Sales team to get started with {% data variables.copilot.copilot_business_short %} or {% data variables.copilot.copilot_enterprise_short %}.
6969

70-
{% note %}
71-
72-
Sign up:
73-
74-
<a href="https://github.com/github-copilot/purchase?ref_product=copilot&ref_type=purchase&ref_style=button&ref_plan=business" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>Copilot Business</span></a> <a href="https://github.com/github-copilot/purchase?ref_product=copilot&ref_type=purchase&ref_style=button&ref_plan=enterprise" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>Copilot Enterprise</span></a>
75-
76-
{% endnote %}
70+
<a href="https://github.com/enterprise/contact?ref_product=copilot&ref_type=engagement&ref_style=button" target="_blank" class="btn btn-outline mt-3 mr-3 no-underline"><span>Contact Sales</span></a>
7771

7872
## Further reading
7973

content/copilot/get-started/plans.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ Start using {% data variables.product.prodname_copilot_short %} by signing up fo
4545

4646
* **{% data variables.copilot.copilot_student %}** — Get access to {% data variables.product.prodname_copilot_short %}'s premium features for free. [Access {% data variables.copilot.copilot_student %}](/copilot/how-tos/manage-your-account/free-access-with-copilot-student).
4747

48-
* **{% data variables.copilot.copilot_pro_short %}** — Get unlimited completions and access to premium models. Includes a free 30-day trial for eligible users. [Try {% data variables.copilot.copilot_pro_short %} for free](https://github.com/github-copilot/signup?ref_product=copilot&ref_type=trial&ref_style=text&ref_plan=pro).
48+
* **{% data variables.copilot.copilot_pro_short %}** — Get unlimited completions and access to premium models. [Subscribe to {% data variables.copilot.copilot_pro_short %}](https://github.com/github-copilot/signup?ref_product=copilot&ref_type=purchase&ref_style=text&ref_plan=pro).
4949

5050
* **{% data variables.copilot.copilot_pro_plus_short %}** — Unlock advanced AI models, extended request limits, and extra capabilities. [Subscribe to {% data variables.copilot.copilot_pro_plus_short %}](https://github.com/github-copilot/signup?ref_product=copilot&ref_type=purchase&ref_style=text&ref_plan=pro).
5151

52-
* **{% data variables.copilot.copilot_business_short %}** — For teams and organizations. [Subscribe to {% data variables.copilot.copilot_business_short %}](https://github.com/github-copilot/purchase?ref_product=copilot&ref_type=purchase&ref_style=button&ref_plan=business).
52+
* **{% data variables.copilot.copilot_business_short %}** — For teams and organizations. [Contact Sales](https://github.com/enterprise/contact?ref_product=copilot&ref_type=engagement&ref_style=text).
5353

54-
* **{% data variables.copilot.copilot_enterprise_short %}** — For enterprises that need advanced features and centralized management. [Subscribe to {% data variables.copilot.copilot_enterprise_short %}](https://github.com/github-copilot/purchase?ref_product=copilot&ref_type=purchase&ref_style=button&ref_plan=enterprise).
54+
* **{% data variables.copilot.copilot_enterprise_short %}** — For enterprises that need advanced features and centralized management. [Contact Sales](https://github.com/enterprise/contact?ref_product=copilot&ref_type=engagement&ref_style=text).

0 commit comments

Comments
 (0)