Skip to content

Commit 8fe0599

Browse files
authored
Merge pull request #37400 from github/repo-sync
Repo sync
2 parents fb3ce1a + e92f0bc commit 8fe0599

File tree

11 files changed

+42
-23
lines changed

11 files changed

+42
-23
lines changed

.github/workflows/orphaned-features-check.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ jobs:
6060
exit 0
6161
fi
6262
63-
# Why only 5?
64-
# Because, we're not in a hurry and anything larger than that would
65-
# make the PR too intimidatingly big to review.
66-
npm run find-orphaned-features -- delete --max 5 --verbose /tmp/orphaned-features.json
63+
npm run find-orphaned-features -- delete --verbose /tmp/orphaned-features.json
6764
6865
git status
6966
358 KB
Loading
301 KB
Loading
519 KB
Loading
285 KB
Loading
344 KB
Loading

data/reusables/copilot/differences-cfi-cfb-table.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
| | {% data variables.product.prodname_copilot_free_short %} | {% data variables.product.prodname_copilot_pro_short %} | {% data variables.product.prodname_copilot_pro_plus_short %} | {% data variables.product.prodname_copilot_business_short %} | {% data variables.product.prodname_copilot_enterprise_short %} |
44
| --- | --- | --- | --- | --- | --- |
55
| Pricing | Not applicable | {% data variables.copilot.cfi_price_per_month %} per month, or<br>{% data variables.copilot.cfi_price_per_year %} per year<br>(free for some users) | {% data variables.copilot.cpp_price_per_month %} per month, or<br>{% data variables.copilot.cpp_price_per_year %} per year<br> | {% data variables.copilot.cfb_price_per_month %} per granted seat per month | {% data variables.copilot.ce_price_per_month %} per granted seat per month |
6-
| Premium requests | 50 per month | 300 per month | 1500 per month | 300 per month | 1000 per month |
6+
| Premium requests | 50 per month | 300 per month | 1500 per month | 300 per user per month | 1000 per user per month |
77
| Purchase additional premium requests at $0.04/request| {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
88

99
{% endrowheaders %}
@@ -89,8 +89,8 @@
8989
| --- | --- | --- | --- | --- | --- |
9090
| {% data variables.product.prodname_copilot_for_prs %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
9191
| Audit logs | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} |{% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
92-
| {% data variables.product.prodname_copilot_short %} knowledge bases |{% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
93-
| Fine tuning a custom large language model (limited {% data variables.release-phases.public_preview %})[^6] | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
92+
| {% data variables.product.prodname_copilot_short %} knowledge bases |{% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} |
93+
| Fine tuning a custom large language model (limited {% data variables.release-phases.public_preview %})[^6] | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} |
9494
| {% data variables.product.prodname_copilot_cli_short %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
9595

9696
{% endrowheaders %}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Each {% data variables.product.prodname_copilot_short %} plan includes a per-user allowance for premium requests:
22

3-
* 300 requests per month for {% data variables.product.prodname_copilot_business_short %}
4-
* 1000 requests per month for {% data variables.product.prodname_copilot_enterprise_short %}
3+
* 300 requests per user per month for {% data variables.product.prodname_copilot_business_short %}
4+
* 1000 requests per user per month for {% data variables.product.prodname_copilot_enterprise_short %}
55

66
{% data variables.product.prodname_copilot_chat_short %}, {% data variables.product.prodname_copilot_agent_short %} mode, {% data variables.product.prodname_copilot_short %} code review, and {% data variables.product.prodname_copilot_extensions_short %} use premium requests, with usage varying by model.

src/frame/components/DefaultLayout.tsx

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@ export const DefaultLayout = (props: Props) => {
5959

6060
const metaDescription = page.introPlainText ? page.introPlainText : t('default_description')
6161

62+
const SOCIAL_CATEGORIES = new Set(['security', 'actions', 'issues', 'copilot'])
63+
const SOCIAL_CARD_IMG_BASE_URL = '/assets/cb-345/images/social-cards'
64+
65+
function getCategoryImageUrl(category: string): string {
66+
return `${SOCIAL_CARD_IMG_BASE_URL}/${category}.png`
67+
}
68+
69+
function getSocialCardImage(): string {
70+
if (currentProduct && SOCIAL_CATEGORIES.has(currentProduct.id)) {
71+
return getCategoryImageUrl(currentProduct.id)
72+
}
73+
return getCategoryImageUrl('default')
74+
}
75+
6276
return (
6377
<DomainNameEditProvider>
6478
<Head>
@@ -111,10 +125,7 @@ export const DefaultLayout = (props: Props) => {
111125
<meta property="og:title" content={page.fullTitle} />
112126
<meta property="og:type" content="article" />
113127
<meta property="og:url" content={fullUrl} />
114-
<meta
115-
property="og:image"
116-
content="https://github.githubassets.com/images/modules/open_graph/github-logo.png"
117-
/>
128+
<meta property="og:image" content={getSocialCardImage()} />
118129
</>
119130
)}
120131
</Head>

src/frame/components/ui/MarkdownContent/UnrenderedMarkdownContent.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@ export const UnrenderedMarkdownContent = ({
6060
{...props}
6161
href={href}
6262
target={openLinksInNewTab ? '_blank' : undefined}
63+
rel={openLinksInNewTab ? 'noopener noreferrer' : undefined}
64+
onClick={(e) => {
65+
// For some reason we need to override the default onClick to get these links to open in a new tab
66+
if (openLinksInNewTab) {
67+
e.stopPropagation()
68+
e.preventDefault()
69+
window.open(href, '_blank')
70+
}
71+
}}
6372
data-group-key={eventGroupKey}
6473
data-group-id={eventGroupId}
6574
>

0 commit comments

Comments
 (0)