Skip to content

Commit 2795737

Browse files
authored
Merge pull request #38853 from github/repo-sync
Repo sync
2 parents be56f46 + 71c262b commit 2795737

File tree

49 files changed

+175
-1651
lines changed

Some content is hidden

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

49 files changed

+175
-1651
lines changed

.github/workflows/index-autocomplete-search.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Index autocomplete search in Elasticsearch
22

3-
# **What it does**: Indexes autocomplete data (general and AI search) into Elasticsearch.
4-
# **Why we have it**: So we can power the APIs for autocomplete.
3+
# **What it does**: Indexes AI search autocomplete data into Elasticsearch.
4+
# **Why we have it**: So we can power the APIs for AI search autocomplete.
55
# **Who does it impact**: docs-engineering
66

77
on:
@@ -40,11 +40,6 @@ jobs:
4040
if: ${{ github.event_name == 'pull_request' }}
4141
run: curl --fail --retry-connrefused --retry 5 -I http://localhost:9200
4242

43-
- name: Run general auto-complete indexing
44-
env:
45-
ELASTICSEARCH_URL: ${{ github.event_name == 'pull_request' && 'http://localhost:9200' || secrets.ELASTICSEARCH_URL }}
46-
run: npm run index-general-autocomplete -- docs-internal-data
47-
4843
- name: Run AI search auto-complete indexing
4944
env:
5045
ELASTICSEARCH_URL: ${{ github.event_name == 'pull_request' && 'http://localhost:9200' || secrets.ELASTICSEARCH_URL }}

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ jobs:
7575
- shielding
7676
# - tests
7777
# - tools
78-
- tracking
7978
- versions
8079
- webhooks
8180
- workflows
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
title: About usage reports
3+
intro: 'Learn how to request and understand a report that shows detailed {% data variables.product.github %} usage and billing information for your account.'
4+
versions:
5+
feature: enhanced-billing-platform
6+
type: how_to
7+
topics:
8+
- Enterprise
9+
- Team
10+
permissions: '{% data reusables.permissions.enhanced-billing-platform %}'
11+
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
12+
---
13+
14+
The usage report shows detailed information about your account’s {% data variables.product.github %} usage, including how much of each SKU was used and the resulting billable amount.
15+
16+
To generate a usage report, see [AUTOTITLE](/billing/managing-your-billing/gathering-insights-on-your-spending).
17+
18+
## Usage report fields
19+
20+
The usage report contains the following fields.
21+
22+
| Field | Description |
23+
|---------------------------|-------------|
24+
| `date` | The day that the usage occurred. All usage is logged in UTC. |
25+
| `product` | The {% data variables.product.github %} product that was used. |
26+
| `sku` | The specific {% data variables.product.github %} product SKU that was used. |
27+
| `quantity` | The amount of the SKU that was used. |
28+
| `unit_type` | The unit of measurement for the product SKU. |
29+
| `applied_cost_per_quantity` | The unit cost of the product SKU. |
30+
| `gross_amount` | The amount of the product SKU that was used. |
31+
| `discount_amount` | The amount of usage that was discounted. Usage that is discounted as part of your account’s included usage is reflected in this field. Also includes discounts for {% data variables.product.prodname_actions %} usage for standard {% data variables.product.github %}-hosted runners in public repositories and for self-hosted runners. |
32+
| `net_amount` | The billable amount of usage after applying the `discount_amount`. This is the amount that your account will be billed. `gross_amount - discount_amount = net_amount`. |
33+
| `username` | The user associated with the usage, if applicable. |
34+
| `organization` | The organization associated with the usage, if applicable. |
35+
| `repository` | The repository associated with the usage, if applicable. |
36+
| `workflow_path` | The path of the {% data variables.product.prodname_actions %} workflow that generated the usage, if applicable. |
37+
| `cost_center_name` | The cost center associated with the usage, if applicable. |
38+
39+
### Deprecated report fields
40+
41+
{% data variables.product.github %} aims to minimize changes to the usage report structure, however at times the report structure or fields may change.
42+
43+
| Deprecated field | Replacement |
44+
|--------------------|---------------------|
45+
| `usage_at` | Refer to `date` instead. |
46+
| `workflow_name` | Refer to `workflow_path` instead. |
47+
48+
## How usage is summarized
49+
50+
To reduce the size of the report, similar usage entries are grouped and totaled. The report summarizes the `quantity`, `gross_amount`, `discount_amount`, and `net_amount` fields based on the combination of the following values: `date`, `sku`, `username`, `workflow_path`, `repository`, `cost_center_name`.
51+
52+
## Receiving the report
53+
54+
Usage reports are sent via email to the default email address associated with your {% data variables.product.github %} account.

content/billing/managing-your-billing/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ children:
1919
- /adding-licenses-to-an-organization
2020
- /roles-for-the-new-billing-platform
2121
- /estimating-spending
22+
- /about-usage-reports
2223
- /gathering-insights-on-your-spending
2324
- /charging-business-units
2425
- /preventing-overspending

content/copilot/using-github-copilot/code-review/using-copilot-code-review.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ The current functionality and availability of the two types of review is summari
2828

2929
{% rowheaders %}
3030

31-
| | Review selection | Review changes |
32-
|------------------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
33-
| Available in | {% data variables.product.prodname_vscode %} | {% data variables.product.prodname_vscode %} and the {% data variables.product.github %} website |
31+
| | Review selection | Review changes |
32+
|------------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
33+
| Available in | {% data variables.product.prodname_vscode %} | {% data variables.product.prodname_vscode %} and the {% data variables.product.github %} website |
3434
| Premium/standard feature | Standard feature available to all {% data variables.product.prodname_copilot_short %} subscribers | Premium feature. Available with the {% data variables.copilot.copilot_pro_short %}, {% data variables.copilot.copilot_pro_plus_short %}, {% data variables.copilot.copilot_business_short %}, and {% data variables.copilot.copilot_enterprise_short %} plans. Per-person monthly quota applies. |
35-
| Description | Initial review of a highlighted section of code with feedback and suggestions | Deeper review of all changes |
36-
| Language support | All | C, C#, C++, Go, Java, JavaScript, Kotlin, Markdown, Python, Ruby, Swift, TypeScript <br><br> {% data variables.release-phases.public_preview_caps %} support for HTML and Text. |
37-
| Custom coding guidelines support | No | Yes, see [Customizing {% data variables.product.prodname_copilot_short %}'s reviews with coding guidelines](#customizing-copilots-reviews-with-coding-guidelines) |
35+
| Description | Initial review of a highlighted section of code with feedback and suggestions | Deeper review of all changes |
36+
| Language support | All | All |
37+
| Custom coding guidelines support | No | Yes, see [Customizing {% data variables.product.prodname_copilot_short %}'s reviews with coding guidelines](#customizing-copilots-reviews-with-coding-guidelines) |
3838

3939
{% endrowheaders %}
4040

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
* **Opt in to user feedback collection:** If enabled, users can provide feedback on {% data variables.product.prodname_copilot_short %} pull request summaries. For more information, see [AUTOTITLE](/enterprise-cloud@latest/copilot/github-copilot-enterprise/copilot-pull-request-summaries/creating-a-pull-request-summary-with-github-copilot).
2-
* **Opt in to preview features:** If enabled, users can test new {% data variables.product.prodname_copilot_short %} features that are not yet generally available. Be aware that previews of features may have flaws, and the features may be changed or discontinued at any time. Current previews of {% data variables.product.prodname_copilot_short %} features include:
3-
4-
* Experimental languages in {% data variables.product.prodname_copilot_short %} code review. See [AUTOTITLE](/copilot/using-github-copilot/code-review/using-copilot-code-review).
5-
* {% data variables.copilot.copilot_spaces %}. See [AUTOTITLE](/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces).
2+
* **Opt in to preview features:** If enabled, users can test new {% data variables.product.prodname_copilot_short %} features that are not yet generally available. Be aware that previews of features may have flaws, and the features may be changed or discontinued at any time. Current previews of {% data variables.product.prodname_copilot_short %} features include {% data variables.copilot.copilot_spaces %}. See [AUTOTITLE](/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces).

data/ui.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ release_notes:
2525
banner_text: GitHub began rolling these changes out to enterprises on
2626
search:
2727
input:
28-
aria_label: Open search overlay
2928
placeholder: Search or ask {{icon}} Copilot
3029
placeholder_no_icon: Search or ask Copilot
3130
shortcut: Type {{icon}} to search
@@ -320,17 +319,7 @@ alerts:
320319
WARNING: Warning
321320
TIP: Tip
322321
CAUTION: Caution
323-
domain_edit:
324-
name: Domain name
325-
edit: Edit
326-
edit_your: Edit your domain name
327-
experimental: Experimental
328-
your_name: Your domain name
329-
cancel: Cancel
330-
save: Save
331-
snippet_about: Updating will include the new domain name in all code snippets across GitHub Docs.
332-
learn_more: Learn more
333-
submission_failed: Submission failed. Please try again in a minute.
322+
334323
cookbook_landing:
335324
spotlight: Spotlight
336325
explore_articles: Explore {{ number }} prompt articles

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@
4949
"general-search-scrape-server": "cross-env NODE_ENV=production PORT=4002 MINIMAL_RENDER=true CHANGELOG_DISABLED=true tsx src/frame/server.ts",
5050
"ghes-release-scrape-with-server": "cross-env GHES_RELEASE=1 start-server-and-test general-search-scrape-server 4002 general-search-scrape",
5151
"general-search-scrape-with-server": "cross-env NODE_OPTIONS='--max_old_space_size=8192' start-server-and-test general-search-scrape-server 4002 general-search-scrape",
52-
"index": "tsx src/search/scripts/index/index-cli autocomplete docs-internal-data",
5352
"index-ai-search-autocomplete": "tsx src/search/scripts/index/index-cli ai-search-autocomplete",
54-
"index-general-autocomplete": "tsx src/search/scripts/index/index-cli general-autocomplete",
5553
"index-general-search": "tsx src/search/scripts/index/index-cli general-search",
5654
"index-test-fixtures": "./src/search/scripts/index-test-fixtures.sh",
5755
"labeler": "tsx .github/actions/labeler/labeler.ts",

src/content-render/unified/processor.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import wrapProceduralImages from './wrap-procedural-images.js'
2727
import parseInfoString from './parse-info-string.js'
2828
import annotate from './annotate.js'
2929
import alerts from './alerts.js'
30-
import replaceDomain from './replace-domain.js'
3130
import removeHtmlComments from 'remark-remove-comments'
3231
import remarkStringify from 'remark-stringify'
3332

@@ -49,7 +48,6 @@ export function createProcessor(context) {
4948
.use(headingLinks)
5049
.use(codeHeader)
5150
.use(annotate)
52-
.use(replaceDomain)
5351
.use(highlight, {
5452
languages: { ...common, graphql, dockerfile, http, groovy, erb, powershell },
5553
subset: false,

src/content-render/unified/replace-domain.js

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)