Skip to content

Commit 958eba5

Browse files
authored
Merge pull request #35389 from github/repo-sync
Repo sync
2 parents f746b91 + 5be4cec commit 958eba5

File tree

22 files changed

+1804
-1903
lines changed

22 files changed

+1804
-1903
lines changed
Loading
Loading
Loading

content/rest/enterprise-admin/index.md

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@ autogenerated: rest
4444

4545
## Endpoint URLs
4646

47-
These endpoints{% ifversion ghes %}—except [Management Console](#management-console) endpoints—{% endif %} are prefixed with the following URL:
47+
These endpoints
48+
{% ifversion management-console-manage-ghes-parity -%}
49+
—except Manage GitHub Enterprise Server API—
50+
{%- else -%}
51+
—except Management Console API—
52+
{%- endif -%}
53+
are prefixed with the following URL:
4854

4955
```shell
5056
{% data variables.product.rest_url %}
@@ -55,7 +61,12 @@ When endpoints include `{enterprise}`, replace `{enterprise}` with the handle fo
5561
{% endif %}
5662

5763
{% ifversion ghes %}
58-
[Management Console](#management-console) endpoints are only prefixed with a hostname:
64+
{% ifversion management-console-manage-ghes-parity -%}
65+
Manage GitHub Enterprise Server API
66+
{%- else -%}
67+
Management Console API
68+
{%- endif %}
69+
endpoints are only prefixed with a hostname:
5970

6071
```shell
6172
http(s)://HOSTNAME/
@@ -70,7 +81,13 @@ Your {% data variables.product.product_name %} installation's API endpoints acce
7081

7182
OAuth tokens must have the `site_admin` [OAuth scope](/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps#available-scopes) when used with these endpoints.
7283

73-
These endpoints are only accessible to authenticated {% data variables.product.product_name %} site administrators, except for the [Management Console](/rest/enterprise-admin/management-console) endpoints, which requires the [Management Console password](/admin/configuration/administering-your-instance-from-the-management-console).
84+
These endpoints are only accessible to authenticated {% data variables.product.product_name %} site administrators, except for the
85+
{% ifversion management-console-manage-ghes-parity -%}
86+
[AUTOTITLE](/rest/enterprise-admin/manage-ghes),
87+
{%- else -%}
88+
[AUTOTITLE](/rest/enterprise-admin/management-console),
89+
{%- endif %}
90+
which requires the [Management Console password](/admin/configuration/administering-your-instance-from-the-management-console).
7491

7592
{% data reusables.enterprise_management_console.api-deprecation %}
7693

content/rest/enterprise-admin/management-console.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ intro: >-
66
Use the REST API to manage your {% data variables.product.product_name %}
77
installation.
88
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
9-
ghes: '*'
9+
ghes: <=3.14
1010
topics:
1111
- API
1212
autogenerated: rest

src/fixtures/fixtures/rest-redirects.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
"/v3/enterprise-admin/global_webhooks": "/en/enterprise-server/rest/enterprise-admin/global-webhooks",
419419
"/v3/enterprise-admin/ldap": "/en/enterprise-server/rest/enterprise-admin/ldap",
420420
"/v3/enterprise-admin/license": "/en/enterprise-server/rest/enterprise-admin/license",
421-
"/v3/enterprise-admin/management_console": "/en/enterprise-server/rest/enterprise-admin/management-console",
421+
"/v3/enterprise-admin/management_console": "/en/enterprise-server/rest/enterprise-admin/manage-ghes",
422422
"/v3/enterprise-admin/orgs": "/en/enterprise-server/rest/enterprise-admin/orgs",
423423
"/v3/enterprise-admin/pre_receive_environments": "/en/enterprise-server/rest/enterprise-admin/pre-receive-environments",
424424
"/v3/enterprise-admin/pre_receive_hooks": "/en/enterprise-server/rest/enterprise-admin/pre-receive-hooks",

src/github-apps/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@
6060
"2022-11-28"
6161
]
6262
},
63-
"sha": "a0508cecd18ab26b525527e4ba35bd9c6d725c4f"
63+
"sha": "d97436bb3672e8d985262803de6ab7cafe1c7ff3"
6464
}

src/landings/components/CategoryLanding.tsx

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,37 @@ export const CategoryLanding = () => {
8585
{intro && <Lead data-search="lead">{intro}</Lead>}
8686

8787
<h2 className="py-5">Spotlight</h2>
88-
<div className="d-md-flex d-sm-block">
89-
<CookBookArticleCard image="DeleteMe" spotlight={true} url="#" />
90-
<CookBookArticleCard image="DeleteMe" spotlight={true} url="#" />
91-
<CookBookArticleCard image="DeleteMe" spotlight={true} url="#" />
88+
<div className="d-md-flex d-sm-block col-md-12">
89+
<div className="col-md-4">
90+
<CookBookArticleCard
91+
image={'/assets/images/copilot-landing/generating_unit_tests.png'}
92+
title="Generate unit tests"
93+
description="Copilot Chat can help with generating unit tests for a function."
94+
spotlight={true}
95+
url="/en/copilot/example-prompts-for-github-copilot-chat/testing-code/generate-unit-tests"
96+
tags={[]}
97+
/>
98+
</div>
99+
<div className="col-md-4">
100+
<CookBookArticleCard
101+
image={'/assets/images/copilot-landing/improving_code_readability.png'}
102+
title="Improving code readability and maintainability"
103+
description="Learn how to improve your code readability and maintainability."
104+
spotlight={true}
105+
url="/en/copilot/example-prompts-for-github-copilot-chat/refactoring-code/improving-code-readability-and-maintainability"
106+
tags={[]}
107+
/>
108+
</div>
109+
<div className="col-md-4">
110+
<CookBookArticleCard
111+
image={'/assets/images/copilot-landing/debugging_invalid_json.png'}
112+
title="Debugging invalid JSON"
113+
description="Copilot can identify and resolve syntax errors or structural issues in JSON data."
114+
spotlight={true}
115+
tags={[]}
116+
url="/en/copilot/example-prompts-for-github-copilot-chat/debugging-errors/debugging-invalid-json"
117+
/>
118+
</div>
92119
</div>
93120

94121
<div className="pt-8">
@@ -110,7 +137,7 @@ export const CategoryLanding = () => {
110137
<li key={index} className="col-md-4 col-sm-12 list-style-none float-left p-4">
111138
<CookBookArticleCard
112139
title={item.title}
113-
description={item.intro}
140+
description={item.intro!}
114141
icon={item.octicon}
115142
tags={[
116143
...(item.industry || []),

src/landings/components/CookBookArticleCard.tsx

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,47 +30,37 @@ const Icons = {
3030
type IconType = keyof typeof Icons
3131

3232
type Props = {
33-
title?: string
33+
title: string
3434
icon?: IconType
35-
url?: string
36-
description?: string
37-
tags?: string[]
35+
url: string
36+
description: string
37+
tags: string[]
3838
spotlight?: boolean
3939
image?: string
4040
complexity?: string
4141
}
4242

43-
const defaultProps = {
44-
title: 'Article Name',
45-
description:
46-
'Man bun letterpress put a bird on it la croix offal, meh grailed hot chicken kombucha gochujang messenger bag fit before they sold out lyft.',
47-
tags: ['Tag Example', 'Tag Example'],
48-
icon: 'book',
49-
}
50-
51-
function setImage(image: string) {
52-
return (
53-
// <div className="d-flex flex-column flex-align-center">
54-
image ? (
55-
<div
56-
style={{
57-
width: 'max-width',
58-
height: 200,
59-
backgroundColor: 'gray',
60-
marginBottom: 20,
61-
borderRadius: 5,
62-
}}
63-
></div>
64-
) : null
65-
// </div>
66-
)
43+
function setImage(image: string, alt: string) {
44+
return image ? (
45+
<img
46+
src={image}
47+
alt={alt}
48+
style={{
49+
backgroundColor: 'gray',
50+
marginBottom: 20,
51+
borderRadius: 5,
52+
width: '100%',
53+
height: 'auto',
54+
}}
55+
/>
56+
) : null
6757
}
6858
const spotlightClasses = 'd-flex flex-column align-items-center'
6959
export const CookBookArticleCard = ({
70-
title = defaultProps.title,
71-
icon = defaultProps.icon as IconType,
72-
tags = defaultProps.tags,
73-
description = defaultProps.description,
60+
title,
61+
icon,
62+
tags,
63+
description,
7464
image = '',
7565
url,
7666
spotlight = false,
@@ -86,7 +76,7 @@ export const CookBookArticleCard = ({
8676
style={{ minHeight: 200 }}
8777
className={spotlight ? spotlightClasses : 'd-flex pb-3 border-bottom'}
8878
>
89-
{spotlight ? setImage(image) : null}
79+
{spotlight ? setImage(image, title) : null}
9080
{spotlight
9181
? null
9282
: IconComponent && (
@@ -104,7 +94,7 @@ export const CookBookArticleCard = ({
10494
{tags.map((tag, index) => (
10595
<Label key={index} variant="accent" sx={{ mr: 1 }} size="small">
10696
{tag}
107-
</Label> //fix this to have unique keys
97+
</Label>
10898
))}
10999
</LabelGroup>
110100
</div>

src/redirects/lib/static/developer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,7 +1857,7 @@
18571857
"/enterprise/v3/enterprise-admin/global_webhooks": "/enterprise-server@latest/rest/enterprise-admin#global-webhooks",
18581858
"/enterprise/v3/enterprise-admin/ldap": "/enterprise-server@latest/rest/enterprise-admin#ldap",
18591859
"/enterprise/v3/enterprise-admin/license": "/enterprise-server@latest/rest/enterprise-admin#license",
1860-
"/enterprise/v3/enterprise-admin/management_console": "/enterprise-server@latest/rest/enterprise-admin#management-console",
1860+
"/enterprise/v3/enterprise-admin/management_console": "/enterprise-server@latest/rest/enterprise-admin/manage-ghes",
18611861
"/enterprise/v3/enterprise-admin/org_pre_receive_hooks": "/enterprise-server@latest/rest/enterprise-admin#organization-pre-receive-hooks",
18621862
"/enterprise/v3/enterprise-admin/orgs": "/enterprise-server@latest/rest/enterprise-admin#orgs",
18631863
"/enterprise/v3/enterprise-admin/pre_receive_environments": "/enterprise-server@latest/rest/enterprise-admin#pre-receive-environments",
@@ -1868,7 +1868,7 @@
18681868
"/enterprise/v3/enterprise/admin_stats": "/enterprise-server@latest/rest/enterprise-admin#admin-stats",
18691869
"/enterprise/v3/enterprise/ldap": "/enterprise-server@latest/rest/enterprise-admin#ldap",
18701870
"/enterprise/v3/enterprise/license": "/enterprise-server@latest/rest/enterprise-admin#license",
1871-
"/enterprise/v3/enterprise/management_console": "/enterprise-server@latest/rest/enterprise-admin#management-console",
1871+
"/enterprise/v3/enterprise/management_console": "/enterprise-server@latest/rest/enterprise-admin/manage-ghes",
18721872
"/enterprise/v3/enterprise/orgs": "/enterprise-server@latest/rest/enterprise-admin#orgs",
18731873
"/enterprise/v3/enterprise/pre_receive_environments": "/enterprise-server@latest/rest/enterprise-admin#pre-receive-environments",
18741874
"/enterprise/v3/enterprise/pre_receive_hooks": "/enterprise-server@latest/rest/enterprise-admin#pre-receive-hooks",
@@ -3009,7 +3009,7 @@
30093009
"/v3/enterprise-admin/global_webhooks": "/enterprise-server@latest/rest/enterprise-admin/global-webhooks",
30103010
"/v3/enterprise-admin/ldap": "/enterprise-server@latest/rest/enterprise-admin/ldap",
30113011
"/v3/enterprise-admin/license": "/enterprise-server@latest/rest/enterprise-admin/license",
3012-
"/v3/enterprise-admin/management_console": "/enterprise-server@latest/rest/enterprise-admin/management-console",
3012+
"/v3/enterprise-admin/management_console": "/enterprise-server@latest/rest/enterprise-admin/manage-ghes",
30133013
"/v3/enterprise-admin/orgs": "/enterprise-server@latest/rest/enterprise-admin/orgs",
30143014
"/v3/enterprise-admin/pre_receive_environments": "/enterprise-server@latest/rest/enterprise-admin/pre-receive-environments",
30153015
"/v3/enterprise-admin/pre_receive_hooks": "/enterprise-server@latest/rest/enterprise-admin/pre-receive-hooks",
@@ -3019,7 +3019,7 @@
30193019
"/v3/enterprise/global_webhooks": "/enterprise-server@latest/rest/enterprise-admin/global-webhooks",
30203020
"/v3/enterprise/ldap": "/enterprise-server@latest/rest/enterprise-admin/ldap",
30213021
"/v3/enterprise/license": "/enterprise-server@latest/rest/enterprise-admin/license",
3022-
"/v3/enterprise/management_console": "/enterprise-server@latest/rest/enterprise-admin/management-console",
3022+
"/v3/enterprise/management_console": "/enterprise-server@latest/rest/enterprise-admin/manage-ghes",
30233023
"/v3/enterprise/org_pre_receive_hooks": "/enterprise-server@latest/rest/enterprise-admin/organization-pre-receive-hooks",
30243024
"/v3/enterprise/orgs": "/enterprise-server@latest/rest/enterprise-admin/orgs",
30253025
"/v3/enterprise/pre_receive_environments": "/enterprise-server@latest/rest/enterprise-admin/pre-receive-environments",

0 commit comments

Comments
 (0)