Skip to content

Commit e060559

Browse files
authored
Merge pull request github#43543 from github/repo-sync
Repo sync
2 parents fa2064e + 682c49e commit e060559

File tree

210 files changed

+149
-13567
lines changed

Some content is hidden

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

210 files changed

+149
-13567
lines changed
11.2 KB
Loading

content/billing/concepts/billing-cycles.md

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ redirect_from:
1111
- /billing/using-the-new-billing-platform/viewing-your-subscriptions-and-billing-date
1212
- /billing/using-the-new-billing-platform/about-the-billing-cycle
1313
- /billing/managing-your-billing/about-the-billing-cycle
14-
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
1514
contentType: concepts
1615
category:
1716
- Get started with billing
@@ -44,27 +43,19 @@ You can switch between annual and monthly billing from the "Licensing" page unde
4443

4544
## How mid-cycle changes affect your billing
4645

47-
Mid-cycle changes to your account can affect your bill.
46+
Changes you make mid-cycle, such as adding or removing users, seats, or resources, can affect your bill. Some behaviors apply to both metered and volume-based billing; others are specific to one model.
4847

49-
### Changes to metered products
48+
### Adding users or resources
5049

51-
Metered products (such as {% data variables.product.prodname_actions %} minutes, {% data variables.product.prodname_registry %} storage, or {% data variables.product.prodname_codespaces %} compute) are billed based on your actual usage throughout the month. For more information on how usage is calculated for a specific product, see [Where to find usage details for specific products](#where-to-find-usage-details-for-specific-products).
52-
53-
### Changes to volume-based products
54-
55-
Volume-based products are billed per user, seat, or resource. Changes to these mid-cycle won’t always immediately change your bill—but they may affect your next invoice.
56-
57-
#### Adding users or resources
58-
59-
* **Add users or licenses**: For license-based products like {% data variables.product.prodname_copilot_short %}, {% data variables.product.prodname_enterprise %}, or {% data variables.product.prodname_GHAS %}, you'll be billed a **prorated amount** based on how many days remain in the current billing cycle.
50+
* **Add users or licenses**: For products like {% data variables.product.prodname_copilot_short %}, {% data variables.product.prodname_enterprise %}, or {% data variables.product.prodname_GHAS %}, you'll be billed a prorated amount for the added licenses based on how many days remain in the current billing cycle.
6051
* **Add organizations or repositories**: These will also result in **prorated charges**, which appear on your next invoice.
6152

62-
#### Removing users or resources
53+
### Removing users or resources
6354

64-
* **Remove users or seats**: The users access is revoked immediately, but you'll still be billed for the **full billing cycle**. Removing a user won't reduce your current bill.
55+
* **Remove users or seats**: The user's access is revoked immediately, but you'll still be billed for the **full billing cycle**. Removing a user won't reduce your current bill.
6556
* **Remove organizations or repositories**: Charges **stop immediately** when removed, but you'll still be billed for any usage **up to that point**.
6657

67-
#### Transferring users or resources
58+
### Transferring users or resources
6859

6960
* **Within the same billing account**: No double-billing. Moving users or resources between organizations under the same account is handled automatically.
7061
* **Between different billing accounts**: Each account is billed according to its own cycle. You may see charges in both accounts if the move overlaps billing periods.

content/billing/concepts/product-billing/git-lfs.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ redirect_from:
3939
- /billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage
4040
- /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage
4141
shortTitle: Git LFS
42-
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
4342
contentType: concepts
4443
category:
4544
- Understand product costs

content/billing/how-tos/set-up-payment/india-one-time-payments.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ category:
1414
- Set up payment
1515
---
1616

17-
1817
## About the Reserve Bank of India's recurring payments regulation
1918

2019
A new payments regulation from the Reserve Bank of India (RBI) recently came into effect. This regulation places additional requirements on recurring online transactions and has prevented some {% data variables.product.company_short %} customers in India from making recurring payments. Customers using payment methods issued in India for any recurring transactions on {% data variables.product.github %} may find that their payments are declined by their banks or card issuers. For more information, see [the RBI's press release](https://www.rbi.org.in/Scripts/BS_PressReleaseDisplay.aspx?prid=51353).
2120

2221
The regulation applies to all recurring transactions, including:
22+
2323
* {% data variables.product.prodname_dotcom %} plan subscriptions (Pro, Team, Enterprise)
2424
* {% data variables.product.prodname_marketplace %} purchases
2525
* {% data variables.product.prodname_sponsors %} transactions
@@ -50,7 +50,7 @@ In the meantime, we are actively working with our payment partners to restore re
5050

5151
Existing sponsorships will remain in place during this period and maintainers will continue to be paid out as expected. Payments for the accrued sponsorship amounts from the funding account will be collected at the same time as other accrued charges.
5252

53-
## Making a one-time payment for a GitHub subscription
53+
## Making a one-time payment for a {% data variables.product.github %} subscription
5454

5555
> [!NOTE]
5656
> Affected customers will receive an email notification with a link to their billing settings when payment is due. Two further reminder emails will be sent 7 and 14 days later if payment has not been made. After 14 days, paid features and services will be locked until payment is made.
@@ -61,4 +61,8 @@ Existing sponsorships will remain in place during this period and maintainers wi
6161
1. Review your billing and payment information.
6262
1. Optionally, if you need to make an edit, click **Edit** next to the relevant section.
6363
1. Click **Submit payment**.
64+
65+
> [!NOTE]
66+
> PayPal is not supported as a payment method for one-time payments. If your saved payment method is a PayPal account, **Submit payment** will be disabled. To complete your payment, update your payment method to a credit or debit card. You can enter card details directly on the payment page.
67+
6468
1. Once payment for the current billing cycle has been successfully made, the **Pay now** button on your "Billing & plans" page will be disabled until your next payment is due.

content/code-security/concepts/supply-chain-security/about-dependabot-alerts.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,27 @@ When {% data variables.product.github %} detects a vulnerable dependency, a {% d
4242

4343
For information about viewing and managing alerts, see [AUTOTITLE](/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts).
4444

45-
## Enabling alerts
45+
## Who can enable alerts?
4646

4747
Repository administrators and organization owners can enable {% data variables.product.prodname_dependabot_alerts %} for their repositories{% ifversion fpt or ghec %} and organizations{% endif %}. When enabled, {% data variables.product.github %} immediately generates the dependency graph and creates alerts for any vulnerable dependencies it identifies. {% ifversion fpt or ghec %} Repository administrators can grant access to additional people or teams.{% endif %}
4848

4949
{% data reusables.repositories.enable-security-alerts %}
5050

5151
See [AUTOTITLE](/code-security/dependabot/dependabot-alerts/configuring-dependabot-alerts).
5252

53-
## Notifications for alerts
53+
{% ifversion dependabot-alerts-assignees %}
54+
55+
## Alert ownership and assignments
56+
57+
Users with write access or higher can assign {% data variables.product.prodname_dependabot_alerts %} to repository collaborators, teams, or {% data variables.product.prodname_copilot_short %} to establish clear ownership for vulnerability remediation. Assignments help track who's responsible for each alert and prevent vulnerabilities from being overlooked.
58+
59+
When an alert is assigned, the assignee receives a notification and the alert displays their name in the alert list. You can filter alerts by assignee to track progress. Assigning an alert to {% data variables.product.prodname_copilot_short %} automatically generates a fix and opens a draft pull request for review.
60+
61+
For information about assigning alerts, see [AUTOTITLE](/code-security/how-tos/manage-security-alerts/manage-dependabot-alerts/viewing-and-updating-dependabot-alerts#viewing-and-prioritizing-dependabot-alerts).
62+
63+
{% endif %}
64+
65+
## How alert notifications work
5466

5567
By default, {% data variables.product.github %} sends email notifications about new alerts to people who both:
5668

@@ -82,7 +94,7 @@ Alternatively, you can opt into the weekly email digest, or even completely turn
8294

8395
{% ifversion copilot-chat-ghas-alerts %}
8496

85-
## Asking {% data variables.copilot.copilot_chat %} about alerts
97+
## {% data variables.copilot.copilot_chat %} integration
8698

8799
With a {% data variables.copilot.copilot_enterprise %} license, you can ask {% data variables.copilot.copilot_chat_short %} questions about {% data variables.product.prodname_dependabot_alerts %} in your organization's repositories. For more information, see [AUTOTITLE](/copilot/using-github-copilot/asking-github-copilot-questions-in-githubcom#asking-questions-about-alerts-from-github-advanced-security-features).
88100

content/code-security/how-tos/manage-security-alerts/manage-dependabot-alerts/viewing-and-updating-dependabot-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ By default, alerts are sorted by **Most important**, which helps you prioritize
5858
![Screenshot showing the "Tags" section in the alert details page.](/assets/images/help/repository/dependabot-alerts-tags-section.png)
5959

6060
{% ifversion dependabot-alerts-assignees %}
61-
1. On the right panel, select an assignee by using the **Assignees** dropdown list. This clearly communicates who is responsible for triaging the alert so that no effort is wasted on repetitive analysis without worrying that alerts might fall through the cracks.
61+
1. On the right panel, select an assignee by using the **Assignees** dropdown list. You can assign the alert to a user or team to establish clear ownership, or assign it to {% data variables.product.prodname_copilot_short %} to automatically generate a fix. This clearly communicates who is responsible for triaging the alert and helps you avoid repetitive analysis. It also ensures that alerts are not missed.
6262
{% endif %}
6363

6464
1. Optionally, to suggest an improvement to the related security advisory, on the right-hand side of the alert details page, click **Suggest improvements for this advisory on the {% data variables.product.prodname_advisory_database %}**. See [AUTOTITLE](/code-security/security-advisories/working-with-global-security-advisories-from-the-github-advisory-database/editing-security-advisories-in-the-github-advisory-database).

content/code-security/reference/security-at-scale/available-filters-for-security-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ For more information about production context, see [AUTOTITLE](/code-security/se
189189

190190
| Qualifier | Description |
191191
| -------- | -------- |
192+
|{% ifversion dependabot-alerts-assignees %}|
193+
| `assignee` | Display alerts by assignee username or team, for example: `assignee:@octocat`, `assignee:@copilot`, or `assignee:@github/security-team`.|
194+
|{% endif %}|
192195
|`ecosystem`|Display {% data variables.product.prodname_dependabot_alerts %} detected in a specified ecosystem, for example: `ecosystem:Maven`.|
193196
|{% ifversion fpt or ghec or ghes > 3.15 %}|
194197
|`epss_percentage`|Display {% data variables.product.prodname_dependabot_alerts %} whose EPSS score meets the defined criteria, for example: `epss_percentage:>=0.01`|

content/copilot/concepts/fallback-and-lts-models.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ An LTS model is an AI model that {% data variables.product.github %} commits to
3939

4040
## Continuous access when premium requests are unavailable
4141

42-
{% data variables.copilot.copilot_gpt_53_codex %} is available on paid plans with a 0x premium request multiplier, which means it does not consume premium requests. This ensures continuous access to {% data variables.product.prodname_copilot_short %} in situations such as:
43-
* Premium request quota exhausted: If a user has used their monthly premium request allowance, they can continue working with {% data variables.copilot.copilot_gpt_41 %} (the former base model) at no additional cost.
44-
* Overage controls disabled: If an organization or enterprise has disabled premium request overages and a user reaches their limit, {% data variables.copilot.copilot_gpt_53_codex %} will not remain available.
42+
{% data variables.copilot.copilot_gpt_53_codex %} is available on paid plans with a 1x premium request multiplier, which means it consumes premium requests. To ensure continuous access to {% data variables.product.prodname_copilot_short %} when premium requests are unavailable:
43+
44+
* Premium request quota exhausted: If a user has used their monthly premium request allowance, {% data variables.product.prodname_copilot_short %} automatically falls back to {% data variables.copilot.copilot_gpt_41 %} (the former base model) at no additional cost to the user.
45+
* Overage controls disabled: If an organization or enterprise has disabled premium request overages and a user reaches their limit, {% data variables.product.prodname_copilot_short %} will fall back to {% data variables.copilot.copilot_gpt_41 %}.
4546

4647
## Further reading
4748

0 commit comments

Comments
 (0)