Skip to content

Commit c791072

Browse files
authored
Merge pull request #45707 from github/repo-sync
Repo sync
2 parents 78b93c7 + 4554f72 commit c791072

80 files changed

Lines changed: 984 additions & 593 deletions

File tree

Some content is hidden

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

.github/workflows/check-for-spammy-prs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ jobs:
3939
const touchesTooMany = files.length > 10
4040
const totalChanges = files.reduce((sum, f) => sum + f.additions + f.deletions, 0)
4141
const isOneLineAddition = files.every(f => f.status === 'added') && totalChanges <= 1
42+
const isBlankLineEdit = totalChanges <= 1 && files.every(f => f.status === 'modified')
4243
4344
// Close the PR and add the invalid label
44-
if (onlyDeletes || isEmptyCommit || touchesTooMany || isOneLineAddition) {
45+
if (onlyDeletes || isEmptyCommit || touchesTooMany || isOneLineAddition || isBlankLineEdit) {
4546
await github.rest.issues.update({
4647
owner: owner,
4748
repo: repo,

.github/workflows/triage-unallowed-contributions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ jobs:
5454
FILE_PATHS_NOT_ALLOWED: ${{ steps.filter.outputs.notAllowed_files }}
5555
CHANGED_FILE_PATHS: ${{ steps.filter.outputs.contentTypes_files }}
5656
ADDED_CONTENT_FILES: ${{ steps.filter.outputs.added_files }}
57-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57+
GITHUB_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}

content/actions/how-tos/troubleshoot-workflows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Specific events allow for filtering by branch, tag, and/or paths you can customi
9797

9898
You can use special characters with filters. For more information, see [AUTOTITLE](/actions/reference/workflows-and-actions/workflow-syntax#filter-pattern-cheat-sheet).
9999

100-
For path filtering, evaluating diffs is limited to the first 300 files. If there are files changed that are not matched in the first 300 files returned by the filter, the workflow will not be run. For more information, see [AUTOTITLE](/actions/reference/workflows-and-actions/workflow-syntax#git-diff-comparisons).
100+
For path filtering, evaluating diffs is limited to the first {% ifversion actions-paths-filter-limit %}3,000{% else %}300{% endif %} files. If there are files changed that are not matched in the first {% ifversion actions-paths-filter-limit %}3,000{% else %}300{% endif %} files returned by the filter, the workflow will not be run. For more information, see [AUTOTITLE](/actions/reference/workflows-and-actions/workflow-syntax#git-diff-comparisons).
101101

102102
## Troubleshoot workflow execution
103103

content/billing/concepts/budgets-and-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Each budget has a type and a scope that define which paid use contributes to spe
2828

2929
* **Universal**: applies to all licensed users by default
3030
* **Cost center user-level**: applies to every user in a cost center
31-
* **Individual**: overrides the above for specific users
31+
* **Individual**: overrides the above for specific users, and can be given an optional expiration date so a temporary override is removed automatically
3232

3333
For {% data variables.product.prodname_copilot_short %}, cost centers can also have included usage controls, which cap how much of the shared {% data variables.product.prodname_ai_credits_short %} pool a cost center can use before metered usage begins. This is a separate control from the budgets and the included usage alerts described below. See [AUTOTITLE](/copilot/concepts/billing/budgets-for-usage-based-billing#included-usage-controls-for-cost-centers).
3434

content/billing/how-tos/set-up-budgets.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,14 @@ As the owner of an enterprise or organization account, or as a billing manager,
120120
* Select a cost center to create a user-level budget that applies to every user in that cost center. This sets one per-user amount for all current and future members, and overrides the universal budget for them.
121121
* Select a specific user to create an individual budget that overrides both the universal budget and any cost center user-level budget for that user.
122122

123+
1. If you selected a specific user, optionally set an expiration date for the individual budget under "Expiration".
124+
125+
* **No expiration**: The budget applies until you edit or delete it. This is the default.
126+
* **End of current billing cycle**: {% data variables.product.github %} removes the budget when the current billing cycle ends.
127+
* **Specific date**: {% data variables.product.github %} removes the budget on the date you choose.
128+
129+
When an individual budget expires, {% data variables.product.github %} removes it and the user falls back to the next budget that applies to them: their cost center user-level budget, if they have one, or otherwise the universal user-level budget. If neither budget is configured, no user-level budget applies. See [AUTOTITLE](/copilot/concepts/billing/budgets-for-usage-based-billing#expiration-dates-for-individual-user-level-budgets).
130+
123131
1. Under "Budget", set a budget amount or license count.
124132

125133
To stop any usage and further spending once the budget limit is reached, select **Stop usage when budget limit is reached** or **Limit usage when budget limit is reached**, if available. **This option is available for metered products and for {% data variables.product.prodname_AS %} SKU-level budgets**. For {% data variables.product.prodname_AS %}, this option prevents new enablement on additional repositories. It doesn't disable {% data variables.product.prodname_AS %} on repositories where it is already active. See [AUTOTITLE](/billing/concepts/product-billing/github-advanced-security#hard-budgets-for-github-advanced-security-skus).
@@ -145,6 +153,8 @@ As the owner of an enterprise or organization account, or as a billing manager,
145153
146154
You can edit or delete a budget at any time, but you cannot change the scope of a budget after creating it.
147155

156+
For an individual user-level budget, you can also change or clear the expiration date at any time.
157+
148158
1. Navigate to the "Budgets and alerts" view. See [Viewing budgets](#viewing-budgets).
149159
1. In the list of budgets, click {% octicon "kebab-horizontal" aria-label="View actions" %} next to the budget you want to edit, and click **{% octicon "pencil" aria-hidden="true" aria-label="pencil" %} Edit** or **{% octicon "trash" aria-hidden="true" aria-label="trash" %} Delete**.
150160
1. Follow the prompts.

0 commit comments

Comments
 (0)